From: Grygorii Strashko Date: Thu, 9 Jan 2014 14:37:06 +0000 (-0500) Subject: ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set X-Git-Tag: v3.14-rc1~7^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e324f7c9ce91b9facdeae2a747435e3e2262f8ae;p=kernel%2Fkernel-generic.git ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set Drop automatic selection of TI_EDMA from Keystone Kconfig file, as it produces build warning in case if CONFIG_DMADEVICES is not set: warning: (ARCH_KEYSTONE) selects TI_EDMA which has unmet direct dependencies (DMADEVICES && (ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE)) Instead enable TI EDMA support from defconfig. Reported-by: Russell King Signed-off-by: Grygorii Strashko Signed-off-by: Santosh Shilimkar Signed-off-by: Olof Johansson --- diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index a018244..4582e16 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -142,6 +142,7 @@ CONFIG_USB_DWC3_DEBUG=y CONFIG_USB_DWC3_VERBOSE=y CONFIG_KEYSTONE_USB_PHY=y CONFIG_DMADEVICES=y +CONFIG_TI_EDMA=y CONFIG_COMMON_CLK_DEBUG=y CONFIG_MEMORY=y CONFIG_EXT4_FS=y diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index dabc5ee..90a708f 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -10,7 +10,6 @@ config ARCH_KEYSTONE select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_ERRATA_798181 if SMP select COMMON_CLK_KEYSTONE - select TI_EDMA select ARCH_SUPPORTS_BIG_ENDIAN select ZONE_DMA if ARM_LPAE help