Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs

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

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1323fa2530eb7c144abe5da9ab1318e410d1c643..d22a4ecffff422f542e96f81527b45a4e3f9c6c2 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -26,6 +26,7 @@ config MICROBLAZE
        select GENERIC_CPU_DEVICES
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
+       select GENERIC_IDLE_POLL_SETUP
        select MODULES_USE_ELF_RELA
        select CLONE_BACKWARDS
 
@@ -38,9 +39,6 @@ config RWSEM_GENERIC_SPINLOCK
 config ZONE_DMA
        def_bool y
 
-config ARCH_POPULATES_NODE_MAP
-       def_bool y
-
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
@@ -56,9 +54,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
-config GENERIC_GPIO
-       bool
-
 config GENERIC_CSUM
        def_bool y