Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 51b028c1ca96402fd95a6ca9dcaddd0b99b94eda..5977fea2c8b1d8cd542ddf831fb405b4de9ea517 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -49,7 +49,6 @@ config X86
        select ARCH_WANTS_DYNAMIC_TASK_STRUCT
        select ARCH_WANT_FRAME_POINTERS
        select ARCH_WANT_IPC_PARSE_VERSION      if X86_32
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select BUILDTIME_EXTABLE_SORT
        select CLKEVT_I8253
        select CLKSRC_I8253                     if X86_32
@@ -638,7 +637,7 @@ config STA2X11
        select X86_DMA_REMAP
        select SWIOTLB
        select MFD_STA2X11
-       select ARCH_REQUIRE_GPIOLIB
+       select GPIOLIB
        default n
        ---help---
          This adds support for boards based on the STA2X11 IO-Hub,