Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[~andy/linux] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bc3a0ebf16a7cf4d7af208fccef71488684f80be..3bf72cd2c8fcbf0f8feebe915d4dc2aca3f44f28 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -668,7 +668,6 @@ config SBUS
 
 config FSL_SOC
        bool
-       select HAVE_CAN_FLEXCAN if NET && CAN
 
 config FSL_PCI
        bool