Merge tag 'for-linus-20130331' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / arch / openrisc / Kconfig

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 9862d20c4bd5997548500d81d4badd27cec3068d..9ab3bf2eca8d2efeef9f0adbadc8b94c356cb857 100644 (file)
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -9,10 +9,9 @@ config OPENRISC
        select OF_EARLY_FLATTREE
        select IRQ_DOMAIN
        select HAVE_MEMBLOCK
-       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARCH_REQUIRE_GPIOLIB
         select HAVE_ARCH_TRACEHOOK
        select HAVE_GENERIC_HARDIRQS
-       select VIRT_TO_BUS
        select GENERIC_IRQ_CHIP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW