From: Uwe Kleine-König Date: Fri, 22 Oct 2010 09:27:08 +0000 (+0200) Subject: imx: only select HAVE_CAN_FLEXCAN if CAN is enabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=71226a4dbf84e6134be6876b71af04bb5d7353be;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git imx: only select HAVE_CAN_FLEXCAN if CAN is enabled This fixes a warning warning: (IMX_HAVE_PLATFORM_FLEXCAN && ARCH_MXC) selects HAVE_CAN_FLEXCAN which has unmet direct dependencies (NET && CAN) (The warning in general exists since 246cf9c (kbuild: Warn on selecting symbols with unmet direct dependencies) which was reverted between 71ebc01 and b1f7d6e.) Reported-and-introduced-by: Marc Kleine-Budde Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig index 404799487f17..26e745b110a7 100644 --- a/arch/arm/plat-mxc/devices/Kconfig +++ b/arch/arm/plat-mxc/devices/Kconfig @@ -6,7 +6,7 @@ config IMX_HAVE_PLATFORM_FEC default y if ARCH_MX25 || SOC_IMX27 || ARCH_MX35 || ARCH_MX51 config IMX_HAVE_PLATFORM_FLEXCAN - select HAVE_CAN_FLEXCAN + select HAVE_CAN_FLEXCAN if CAN bool config IMX_HAVE_PLATFORM_IMX_I2C