summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 19:07:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 19:07:22 +0100
commit1543966a079fc7065849ae43ca4dd767c188ad55 (patch)
tree760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/mfd/Makefile
parent5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff)
parent4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff)
downloadtalos-obmc-linux-1543966a079fc7065849ae43ca4dd767c188ad55.tar.gz
talos-obmc-linux-1543966a079fc7065849ae43ca4dd767c188ad55.zip
Merge branch 'pxa-palm' into pxa-machines
Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r--drivers/mfd/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 03ad239ecef0..6abebe364419 100644
--- 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
OpenPOWER on IntegriCloud