Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[karo-tx-linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8382dc832929a4044bbb61ec3c4423a738a5a8df..aa73ef3233b8e977223c969d2f734f904e0fa6bf 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -409,6 +409,13 @@ config GPIO_TWL4030
          Say yes here to access the GPIO signals of various multi-function
          power management chips from Texas Instruments.
 
+config GPIO_TWL6040
+       tristate "TWL6040 GPO"
+       depends on TWL6040_CORE
+       help
+         Say yes here to access the GPO signals of twl6040
+         audio chip from Texas Instruments.
+
 config GPIO_WM831X
        tristate "WM831x GPIOs"
        depends on MFD_WM831X