Merge branch 'depends/rmk/gpio' into next/fixes

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d539efd96d4..4caa3d37bbd 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -178,6 +178,15 @@ 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