aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-27 09:45:58 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2009-09-17 03:47:00 -0400
commitb11062b9c558695cd054f16c697e1db0988e2603 (patch)
tree2cb76037f0906d0a025cce4e7a26b5da05927665
parent698659d5f78606c698781574773f433c60176e40 (diff)
mfd: Hook WM831x into build system
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/Kconfig10
-rw-r--r--drivers/mfd/Makefile2
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 491ac0f800d2..0273456af77f 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -157,6 +157,16 @@ config MFD_WM8400
157 the device, additional drivers must be enabled in order to use 157 the device, additional drivers must be enabled in order to use
158 the functionality of the device. 158 the functionality of the device.
159 159
160config MFD_WM831X
161 tristate "Support Wolfson Microelectronics WM831x PMICs"
162 select MFD_CORE
163 depends on I2C
164 help
165 Support for the Wolfson Microelecronics WM831x PMICs. This
166 driver provides common support for accessing the device,
167 additional drivers must be enabled in order to use the
168 functionality of the device.
169
160config MFD_WM8350 170config MFD_WM8350
161 tristate 171 tristate
162 172
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 6f8a9a1af20b..285cb320e6a6 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -15,6 +15,8 @@ obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o
15obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o 15obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o
16 16
17obj-$(CONFIG_MFD_WM8400) += wm8400-core.o 17obj-$(CONFIG_MFD_WM8400) += wm8400-core.o
18wm831x-objs := wm831x-core.o wm831x-irq.o wm831x-otp.o
19obj-$(CONFIG_MFD_WM831X) += wm831x.o
18wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o 20wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o
19obj-$(CONFIG_MFD_WM8350) += wm8350.o 21obj-$(CONFIG_MFD_WM8350) += wm8350.o
20obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o 22obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o