Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 1f8563bde4a917a26e0fb5b89d16333f29f2e586..550f29744812fe15c748f5c04670df0fcf11492b 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -18,4 +18,8 @@ config MCP_UCB1200
        tristate "Support for UCB1200 / UCB1300"
        depends on MCP
 
+config MCP_UCB1200_TS
+       tristate "Touchscreen interface support"
+       depends on MCP_UCB1200 && INPUT
+
 endmenu