Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index a68b341831070873977e1be0fdce6bc981bb31ac..7298d07a9f71bc2e8a6fb00fb69468fcfc3c9df5 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -46,6 +46,7 @@ config ARCH_LUBBOCK
 
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
+       select GPIO_REG
        select PXA27x
 
 config MACH_ZYLONITE
@@ -551,7 +552,6 @@ config TOSA_BT
 config TOSA_USE_EXT_KEYCODES
        bool "Tosa keyboard: use extended keycodes"
        depends on MACH_TOSA
-       default n
        help
          Say Y here to enable the tosa keyboard driver to generate extended
          (>= 127) keycodes. Be aware, that they can't be correctly interpreted