Merge with ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 6bd44a44cd28bedc1b3b3157f88e44c99645b5d6..dee393257605edf0828c7021aea0dd21485e15f5 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -102,6 +102,20 @@ config TPS65010
          This driver can also be built as a module.  If so, the module
          will be called tps65010.
 
+config SENSORS_TLV320AIC23
+       tristate "Texas Instruments TLV320AIC23 Codec"
+       depends on I2C && I2C_OMAP
+       help
+         If you say yes here you get support for the I2C control
+         interface for Texas Instruments TLV320AIC23 audio codec.
+
+config GPIOEXPANDER_OMAP
+       bool "GPIO Expander PCF8574PWR for OMAP"
+       depends on I2C && ARCH_OMAP16XX
+       help
+         If you say yes here you get support for I/O expander calls
+         to configure IrDA, Camera and audio devices endmenu
+
 config SENSORS_M41T00
        tristate "ST M41T00 RTC chip"
        depends on I2C && PPC32