Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[~andy/linux] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 542f0c04b6958037b3cf1c468e7705f779f8e11b..502b5ea43f4fae28db5a9eb65f3c37d0daf52e69 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -253,6 +253,12 @@ config GPIO_GE_FPGA
 
 comment "I2C GPIO expanders:"
 
+config GPIO_ARIZONA
+       tristate "Wolfson Microelectronics Arizona class devices"
+       depends on MFD_ARIZONA
+       help
+         Support for GPIOs on Wolfson Arizona class devices.
+
 config GPIO_MAX7300
        tristate "Maxim MAX7300 GPIO expander"
        depends on I2C
@@ -466,6 +472,18 @@ config GPIO_BT8XX
 
          If unsure, say N.
 
+config GPIO_AMD8111
+       tristate "AMD 8111 GPIO driver"
+       depends on PCI
+       help
+         The AMD 8111 south bridge contains 32 GPIO pins which can be used.
+
+         Note, that usually system firmware/ACPI handles GPIO pins on their
+         own and users might easily break their systems with uncarefull usage
+         of this driver!
+
+         If unsure, say N
+
 config GPIO_LANGWELL
        bool "Intel Langwell/Penwell GPIO support"
        depends on PCI && X86