Merge branch 'master' into upstream

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 1588a59e3767a18a2a03fbf7bf1ba7a0d54b2bbb..fc3c8854f43015ca90f2c82d18be5ef1d08d4fb6 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Multimedia Capabilities Port drivers"
+       depends on ARCH_SA1100
 
 config MCP
        tristate
@@ -13,4 +14,13 @@ config MCP_SA11X0
        depends on ARCH_SA1100
        select MCP
 
+# Chip drivers
+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