summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 16:37:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 16:37:37 -0700
commita483ab1dddf86a0e8924e94cf838eed602602b39 (patch)
tree3cfd2da7cfec32f5c1bc54dfb1d491bfa07d444f /drivers/mfd/Makefile
parenteba966a4e780199e31e8fd1d21bc9d187b1c9eaf (diff)
parent9c366452e0b2df06f3ce0aabc6a53c94c595cd00 (diff)
downloadlinux-a483ab1dddf86a0e8924e94cf838eed602602b39.tar.gz
linux-a483ab1dddf86a0e8924e94cf838eed602602b39.tar.bz2
linux-a483ab1dddf86a0e8924e94cf838eed602602b39.zip
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
* 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: Make WM8400 depend on I2C until SPI is submitted mfd: add missing Kconfig entry for da903x
Diffstat (limited to 'drivers/mfd/Makefile')
-rw-r--r--drivers/mfd/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 0acefe8aff87..9a5ad8af9116 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -30,3 +30,5 @@ ifeq ($(CONFIG_SA1100_ASSABET),y)
obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o
endif
obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o
+
+obj-$(CONFIG_PMIC_DA903X) += da903x.o \ No newline at end of file