]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
authorGrygorii Strashko <grygorii.strashko@ti.com>
Thu, 9 Jan 2014 14:37:06 +0000 (09:37 -0500)
committerOlof Johansson <olof@lixom.net>
Fri, 31 Jan 2014 23:03:53 +0000 (15:03 -0800)
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 <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/configs/keystone_defconfig
arch/arm/mach-keystone/Kconfig

index a0182447d1334d6823d7e397e3a9a94cbd8c1e12..4582e160feab4ebbe01b1b40d5e5dd969d2289d7 100644 (file)
@@ -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
index dabc5eee52e71b082de0a23af8645df2c206468d..90a708fef54136b80a1868abd987f663cedf3fb5 100644 (file)
@@ -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