5 files changed, 1 insertions, 11 deletions

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ba44328464f3..af8e109953d1 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -111,7 +111,6 @@ config SOC_IMX25
         select ARCH_MXC_IOMUX_V3
         select COMMON_CLK
         select CPU_ARM926T
-        select HAVE_CAN_FLEXCAN if CAN
         select MXC_AVIC
 
 config SOC_IMX27
@@ -137,7 +136,6 @@ config SOC_IMX35
         select ARCH_MXC_IOMUX_V3
         select COMMON_CLK
         select CPU_V6K
-        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_EPIT
         select MXC_AVIC
         select SMP_ON_UP if SMP
@@ -776,7 +774,6 @@ comment "Device tree only"
 
 config  SOC_IMX53
         bool "i.MX53 support"
-        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_IMX_SRC
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select PINCTRL
@@ -799,7 +796,6 @@ config SOC_IMX6Q
         select CPU_V7
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if LOCAL_TIMERS
-        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_IMX_ANATOP
         select HAVE_IMX_GPC
         select HAVE_IMX_MMDC
diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
index 3dd2b1b041d1..68c74fb0373c 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -4,7 +4,6 @@ config IMX_HAVE_PLATFORM_FEC
 
 config IMX_HAVE_PLATFORM_FLEXCAN
         bool
-        select HAVE_CAN_FLEXCAN if CAN
 
 config IMX_HAVE_PLATFORM_FSL_USB2_UDC
         bool
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 4dc2fbba0ecd..ce6e7d606a7c 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -11,7 +11,6 @@ config SOC_IMX28
         select ARM_AMBA
         select ARM_CPU_SUSPEND if PM
         select CPU_ARM926T
-        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_PWM
         select PINCTRL_IMX28
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c33e3ad2c8fd..7754c6b8c453 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -674,7 +674,6 @@ config SBUS
 
 config FSL_SOC
         bool
-        select HAVE_CAN_FLEXCAN if NET && CAN
 
 config FSL_PCI
         bool
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index e456b70933c2..3c069472eb8b 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -102,12 +102,9 @@ config CAN_JANZ_ICAN3
           This driver can also be built as a module. If so, the module will be
           called janz-ican3.ko.
 
-config HAVE_CAN_FLEXCAN
-        bool
-
 config CAN_FLEXCAN
         tristate "Support for Freescale FLEXCAN based chips"
-        depends on HAVE_CAN_FLEXCAN
+        depends on ARM || PPC
         ---help---
           Say Y here if you want to support for Freescale FlexCAN.