Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[pandora-kernel.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 008c38b..fced190 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -45,7 +45,7 @@ config GPIO_PCA953X
          will be called pca953x.
 
 config GPIO_PCF857X
-       tristate "PCF857x, PCA857x, and PCA967x I2C GPIO expanders"
+       tristate "PCF857x, PCA{85,96}7x, and MAX732[89] I2C GPIO expanders"
        depends on I2C
        help
          Say yes here to provide access to most "quasi-bidirectional" I2C
@@ -54,7 +54,8 @@ config GPIO_PCF857X
          some of them.  Compatible models include:
 
          8 bits:   pcf8574, pcf8574a, pca8574, pca8574a,
-                   pca9670, pca9672, pca9674, pca9674a
+                   pca9670, pca9672, pca9674, pca9674a,
+                   max7328, max7329
 
          16 bits:  pcf8575, pcf8575c, pca8575,
                    pca9671, pca9673, pca9675
@@ -69,6 +70,12 @@ config GPIO_PCF857X
 
 comment "SPI GPIO expanders:"
 
+config GPIO_MAX7301
+       tristate "Maxim MAX7301 GPIO expander"
+       depends on SPI_MASTER
+       help
+         gpio driver for Maxim MAX7301 SPI GPIO expander.
+
 config GPIO_MCP23S08
        tristate "Microchip MCP23S08 I/O expander"
        depends on SPI_MASTER