Merge commit 'v2.6.26' into bkl-removal

[linux-2.6] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 74fac0f5c348902a7ed9355ae746a6e946fdc8b3..008c38ba774f588f3a739983bb6f47e48ef618f5 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -27,15 +27,22 @@ config DEBUG_GPIO
 
 comment "I2C GPIO expanders:"
 
-config GPIO_PCA9539
-       tristate "PCA9539 16-bit I/O port"
+config GPIO_PCA953X
+       tristate "PCA953x, PCA955x, and MAX7310 I/O ports"
        depends on I2C
        help
-         Say yes here to support the PCA9539 16-bit I/O port. These
-         parts are made by NXP and TI.
+         Say yes here to provide access to several register-oriented
+         SMBus I/O expanders, made mostly by NXP or TI.  Compatible
+         models include:
+
+         4 bits:       pca9536, pca9537
+
+         8 bits:       max7310, pca9534, pca9538, pca9554, pca9557
+
+         16 bits:      pca9535, pca9539, pca9555
 
          This driver can also be built as a module.  If so, the module
-         will be called pca9539.
+         will be called pca953x.
 
 config GPIO_PCF857X
        tristate "PCF857x, PCA857x, and PCA967x I2C GPIO expanders"