1 files changed, 20 insertions, 18 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d539efd96d4b..8482a23887dc 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -95,14 +95,18 @@ config GPIO_EP93XX
         depends on ARCH_EP93XX
         select GPIO_GENERIC
 
-config GPIO_EXYNOS4
-        def_bool y
-        depends on CPU_EXYNOS4210
-
 config GPIO_MPC5200
         def_bool y
         depends on PPC_MPC52xx
 
+config GPIO_MPC8XXX
+        bool "MPC512x/MPC8xxx GPIO support"
+        depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
+                   FSL_SOC_BOOKE || PPC_86xx
+        help
+          Say Y here if you're going to use hardware that connects to the
+          MPC512x/831x/834x/837x/8572/8610 GPIOs.
+
 config GPIO_MSM_V1
         tristate "Qualcomm MSM GPIO v1"
         depends on GPIOLIB && ARCH_MSM
@@ -131,18 +135,6 @@ config GPIO_MXS
         select GPIO_GENERIC
         select GENERIC_IRQ_CHIP
 
-config GPIO_PLAT_SAMSUNG
-        def_bool y
-        depends on SAMSUNG_GPIOLIB_4BIT
-
-config GPIO_S5PC100
-        def_bool y
-        depends on CPU_S5PC100
-
-config GPIO_S5PV210
-        def_bool y
-        depends on CPU_S5PV210
-
 config GPIO_PL061
         bool "PrimeCell PL061 GPIO support"
         depends on ARM_AMBA
@@ -178,9 +170,18 @@ config GPIO_SCH
           The Intel Tunnel Creek processor has 5 GPIOs powered by the
           core power rail and 9 from suspend power supply.
 
+config GPIO_U300
+        bool "ST-Ericsson U300 COH 901 335/571 GPIO"
+        depends on GPIOLIB && ARCH_U300
+        help
+          Say yes here to support GPIO interface on ST-Ericsson U300.
+          The names of the two IP block variants supported are
+          COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
+          ports of 8 GPIO pins each.
+
 config GPIO_VX855
         tristate "VIA VX855/VX875 GPIO"
-        depends on MFD_SUPPORT && PCI
+        depends on PCI
         select MFD_CORE
         select MFD_VX855
         help
@@ -388,6 +389,7 @@ config GPIO_LANGWELL
 config GPIO_PCH
         tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GPIO"
         depends on PCI && X86
+        select GENERIC_IRQ_CHIP
         help
           This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff
           which is an IOH(Input/Output Hub) for x86 embedded processor.
@@ -402,6 +404,7 @@ config GPIO_PCH
 config GPIO_ML_IOH
         tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
         depends on PCI
+        select GENERIC_IRQ_CHIP
         help
           ML7213 is companion chip for Intel Atom E6xx series.
           This driver can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/Output
@@ -417,7 +420,6 @@ config GPIO_TIMBERDALE
 config GPIO_RDC321X
         tristate "RDC R-321x GPIO support"
         depends on PCI
-        select MFD_SUPPORT
         select MFD_CORE
         select MFD_RDC321X
         help