projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
Kconfig
diff --git
a/drivers/mfd/Kconfig
b/drivers/mfd/Kconfig
index 1489c3540f96bab496aa6b0681c0ada3637d09c3..243e0c663c37be28fc2282dc98be2e9715f7804a 100644
(file)
--- a/
drivers/mfd/Kconfig
+++ b/
drivers/mfd/Kconfig
@@
-848,8
+848,9
@@
config MCP_SA11X0
# Chip drivers
config MCP_UCB1200
- tristate "Support for UCB1200 / UCB1300"
- depends on MCP
+ bool "Support for UCB1200 / UCB1300"
+ depends on MCP_SA11X0
+ select MCP
config MCP_UCB1200_TS
tristate "Touchscreen interface support"