Re: [PATCH v2 2/2] staging: Mediatek: Use individual config flags in Makefile

[Greg Kroah-Hartman]

On Thu, Jan 10, 2019 at 05:43:37PM -0700, thirtythreeforty@xxxxxxxxx wrote:
> From: George Hilliard <thirtythreeforty@xxxxxxxxx>
> 
> These drivers are useful on other MT76xx SoCs, which have compatible
> peripherals.  The drivers are selectable in Kconfig, but they were
> quietly excluded from the build because the SOC_MT7621 chip was not
> selected.  So, make the main staging Makefile use the same flags as
> everything else for these drivers.
> 
> mt7621-dma and mt7621-dts are left alone because they truly do require
> that SoC.
> 
> I have personally confirmed that the mt7621-spi driver works on the
> MT7688, which was what prompted this change.
> 
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: devel@xxxxxxxxxxxxxxxxxxxx
> Cc: NeilBrown <neil@xxxxxxxxxx>
> Signed-off-by: George Hilliard <thirtythreeforty@xxxxxxxxx>
> ---
>  drivers/staging/Makefile | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> index e095f427177c..4b78ea2c7848 100644
> --- a/drivers/staging/Makefile
> +++ b/drivers/staging/Makefile
> @@ -42,12 +42,12 @@ obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
>  obj-$(CONFIG_DRM_VBOXVIDEO)	+= vboxvideo/
>  obj-$(CONFIG_PI433)		+= pi433/
>  obj-$(CONFIG_SOC_MT7621)	+= mt7621-pci/
> -obj-$(CONFIG_SOC_MT7621)	+= mt7621-pinctrl/
> -obj-$(CONFIG_SOC_MT7621)	+= mt7621-spi/
> +obj-$(CONFIG_PINCTRL_RT2880)	+= mt7621-pinctrl/
> +obj-$(CONFIG_SPI_MT7621)	+= mt7621-spi/
>  obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/
> -obj-$(CONFIG_SOC_MT7621)	+= ralink-gdma/
> -obj-$(CONFIG_SOC_MT7621)	+= mt7621-mmc/
> -obj-$(CONFIG_SOC_MT7621)	+= mt7621-eth/
> +obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/
> +obj-$(CONFIG_MTK_MMC)		+= mt7621-mmc/
> +obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)	+= mt7621-eth/
>  obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/
>  obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket/
>  obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/

This patch doesn't apply to my tree at all, can you rebase and resend?

thanks,

greg k-h