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/watchdog/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/watchdog/Makefile')
| -rw-r--r-- | drivers/watchdog/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 468c3204c3b1..de1701470c14 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -178,3 +178,4 @@ obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o +obj-$(CONFIG_MENF21BMC_WATCHDOG) += menf21bmc_wdt.o |