diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /drivers/gpio/Kconfig | |
parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff) | |
parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
download | linux-335332770c68649ffeaf5dc2b58d9cd40041e295.tar.gz |
Merge branch 'depends/rmk/gpio' into next/board
Conflicts: arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-at91/board-usb-a9263.c arch/arm/mach-tegra/board-paz00.h arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'drivers/gpio/Kconfig')
-rw-r--r-- | drivers/gpio/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index d539efd96d4b..4caa3d37bbde 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 |