Merge remote-tracking branch 'net/master'

[karo-tx-linux.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0a3d5560c9be90d6dc00e605c6523d192db0fa7d..b1a9cfc812ce0068266b0a2bd0769c5fb8fd94d1 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -656,6 +656,8 @@ config SBUS
 
 config FSL_SOC
        bool
+       select HAVE_CAN_FLEXCAN if NET && CAN
+       select PPC_CLOCK if CAN_FLEXCAN
 
 config FSL_PCI
        bool