diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:11:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:11:12 -0800 |
| commit | 42d4ebb42a17754d2e8344dc1aa486119671d0eb (patch) | |
| tree | b5a9e0a4ecc5a9041912102790bb089601c7afa4 /drivers/watchdog/intel-mid_wdt.c | |
| parent | 6aabef681df96b851b4a11459520d4a20ab1cae4 (diff) | |
| parent | 760d280084f8805e5de73e3591912d5db9da9dbe (diff) | |
| download | blackbird-obmc-linux-42d4ebb42a17754d2e8344dc1aa486119671d0eb.tar.gz blackbird-obmc-linux-42d4ebb42a17754d2e8344dc1aa486119671d0eb.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog update from Wim Van Sebroeck:
- New driver for Broadcom 7038 Set-Top Box
- imx2_wdt: Use register definition in regmap_write()
- intel-mid: add Magic Closure flag
- watchdog framework improvements:
- Use device tree alias for naming watchdogs
- propagate ping error code to the user space
- Always evaluate new timeout against min_timeout
- Use single variable name for struct watchdog_device
- include clean-ups
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: include: add units for timeout values in kerneldoc
watchdog: include: fix some typos
watchdog: core: propagate ping error code to the user space
watchdog: watchdog_dev: Use single variable name for struct watchdog_device
watchdog: Always evaluate new timeout against min_timeout
watchdog: intel-mid: add Magic Closure flag
watchdog: imx2_wdt: Use register definition in regmap_write()
watchdog: watchdog_dev: Use device tree alias for naming watchdogs
watchdog: Watchdog driver for Broadcom Set-Top Box
watchdog: bcm7038: add device tree binding documentation
Diffstat (limited to 'drivers/watchdog/intel-mid_wdt.c')
| -rw-r--r-- | drivers/watchdog/intel-mid_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c index 0a436b5d1e84..db36d12e2b52 100644 --- a/drivers/watchdog/intel-mid_wdt.c +++ b/drivers/watchdog/intel-mid_wdt.c @@ -101,7 +101,7 @@ static irqreturn_t mid_wdt_irq(int irq, void *dev_id) static const struct watchdog_info mid_wdt_info = { .identity = "Intel MID SCU watchdog", - .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT, + .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, }; static const struct watchdog_ops mid_wdt_ops = { |
