1 files changed, 13 insertions, 29 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index f8b6e7d27e4c..89a6a34cc515 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -63,6 +63,9 @@ config GPIO_SYSFS
           Kernel drivers may also request that a particular GPIO be
           exported to userspace; this can be useful when debugging.
 
+config GPIO_GENERIC
+        tristate
+
 # put drivers in the right section, in alphabetical order
 
 config GPIO_MAX730X
@@ -70,16 +73,11 @@ config GPIO_MAX730X
 
 comment "Memory mapped GPIO drivers:"
 
-config GPIO_BASIC_MMIO_CORE
-        tristate
-        help
-          Provides core functionality for basic memory-mapped GPIO controllers.
-
-config GPIO_BASIC_MMIO
-        tristate "Basic memory-mapped GPIO controllers support"
-        select GPIO_BASIC_MMIO_CORE
+config GPIO_GENERIC_PLATFORM
+        tristate "Generic memory-mapped GPIO controller support (MMIO platform device)"
+        select GPIO_GENERIC
         help
-          Say yes here to support basic memory-mapped GPIO controllers.
+          Say yes here to support basic platform_device memory-mapped GPIO controllers.
 
 config GPIO_IT8761E
         tristate "IT8761E GPIO support"
@@ -94,14 +92,14 @@ config GPIO_EXYNOS4
         def_bool y
         depends on CPU_EXYNOS4210
 
-config GPIO_MXS
-        def_bool y
-        depends on ARCH_MXS
-
 config GPIO_MXC
         def_bool y
         depends on ARCH_MXC
-        select GPIO_BASIC_MMIO_CORE
+        select GPIO_GENERIC
+
+config GPIO_MXS
+        def_bool y
+        depends on ARCH_MXS
 
 config GPIO_PLAT_SAMSUNG
         def_bool y
@@ -150,9 +148,6 @@ config GPIO_SCH
           The Intel Tunnel Creek processor has 5 GPIOs powered by the
           core power rail and 9 from suspend power supply.
 
-          This driver can also be built as a module. If so, the module
-          will be called sch-gpio.
-
 config GPIO_VX855
         tristate "VIA VX855/VX875 GPIO"
         depends on MFD_SUPPORT && PCI
@@ -215,9 +210,6 @@ config GPIO_PCA953X
 
           16 bits:      pca9535, pca9539, pca9555, tca6416
 
-          This driver can also be built as a module.  If so, the module
-          will be called pca953x.
-
 config GPIO_PCA953X_IRQ
         bool "Interrupt controller support for PCA953x"
         depends on GPIO_PCA953X=y
@@ -309,17 +301,12 @@ config GPIO_ADP5520
           This option enables support for on-chip GPIO found
           on Analog Devices ADP5520 PMICs.
 
-          To compile this driver as a module, choose M here: the module will
-          be called adp5520-gpio.
-
 config GPIO_ADP5588
         tristate "ADP5588 I2C GPIO expander"
         depends on I2C
         help
           This option enables support for 18 GPIOs found
           on Analog Devices ADP5588 GPIO Expanders.
-          To compile this driver as a module, choose M here: the module will be
-          called adp5588-gpio.
 
 config GPIO_ADP5588_IRQ
         bool "Interrupt controller support for ADP5588"
@@ -441,9 +428,6 @@ config GPIO_UCB1400
           This enables support for the Philips UCB1400 GPIO pins.
           The UCB1400 is an AC97 audio codec.
 
-          To compile this driver as a module, choose M here: the
-          module will be called ucb1400_gpio.
-
 comment "MODULbus GPIO expanders:"
 
 config GPIO_JANZ_TTL
@@ -454,7 +438,7 @@ config GPIO_JANZ_TTL
           This driver provides support for driving the pins in output
           mode only. Input mode is not supported.
 
-config AB8500_GPIO
+config GPIO_AB8500
         bool "ST-Ericsson AB8500 Mixed Signal Circuit gpio functions"
         depends on AB8500_CORE && BROKEN
         help