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 5374776b4c7c12a18a847abec17023b9df7dc438..3bf72cd2c8fcbf0f8feebe915d4dc2aca3f44f28 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -138,6 +138,7 @@ config PPC
        select ARCH_USE_BUILTIN_BSWAP
        select OLD_SIGSUSPEND
        select OLD_SIGACTION if PPC32
+       select HAVE_DEBUG_STACKOVERFLOW
 
 config EARLY_PRINTK
        bool
@@ -334,7 +335,7 @@ config SWIOTLB
 
 config HOTPLUG_CPU
        bool "Support for enabling/disabling CPUs"
-       depends on SMP && HOTPLUG && (PPC_PSERIES || \
+       depends on SMP && (PPC_PSERIES || \
        PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
        ---help---
          Say Y here to be able to disable and re-enable individual
@@ -667,7 +668,6 @@ config SBUS
 
 config FSL_SOC
        bool
-       select HAVE_CAN_FLEXCAN if NET && CAN
 
 config FSL_PCI
        bool