diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2014-09-24 09:25:06 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-09-24 09:25:06 -0700 |
| commit | 7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee (patch) | |
| tree | 38a7548d5a36cc20145eb916319fe673b84341b1 /drivers/mfd/Makefile | |
| parent | c08860ffe5c0e986e208e8217dae8191c0b40b24 (diff) | |
| parent | 964356938fcd3c0001a786f55b9f0a0fbe47656a (diff) | |
Merge tag 'mfd-hwmon-leds-watchdog-v3.18' into hwmon-next
Immutable branch between MFD, HWMON, LEDs and Watchdog for v3.18
Diffstat (limited to 'drivers/mfd/Makefile')
| -rw-r--r-- | drivers/mfd/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index f00148782d9..d58068aa8aa 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -169,6 +169,7 @@ obj-$(CONFIG_MFD_AS3711) += as3711.o obj-$(CONFIG_MFD_AS3722) += as3722.o obj-$(CONFIG_MFD_STW481X) += stw481x.o obj-$(CONFIG_MFD_IPAQ_MICRO) += ipaq-micro.o +obj-$(CONFIG_MFD_MENF21BMC) += menf21bmc.o intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o |