projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pxa-palm' into pxa-machines
[linux-2.6-block.git]
/
drivers
/
mfd
/
Makefile
diff --git
a/drivers/mfd/Makefile
b/drivers/mfd/Makefile
index 03ad239ecef0ba0fde5cc1dbebe579203953174f..6abebe364419ed9668f0e08ea68abf0c362a7733 100644
(file)
--- a/
drivers/mfd/Makefile
+++ b/
drivers/mfd/Makefile
@@
-22,3
+22,4
@@
obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o
ifeq ($(CONFIG_SA1100_ASSABET),y)
obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o
endif
+obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o