Merge git://www.linux-watchdog.org/linux-watchdog

Browse source

Pull watchdog fixes from Wim Van Sebroeck:
 "This fixes several Kconfig dependencies, a compilation warning in
  pcwd_usb, a failure to abort the sp805 wdt after a ping and the
  max63xx wdt's MODULE_LICENSE"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Fix dependencies for !HAS_IOMEM archs
  watchdog: imgdpc: select WATCHDOG_CORE
  watchdog: tango: rename ARCH_TANGOX to ARCH_TANGO
  watchdog: pcwd_usb: fix compilation warning
  watchdog: sp805: ping fails to abort wdt reset
  watchdog: max63xx: make module's license marker match the header

...

This commit is contained in:

Linus Torvalds 2016-02-05 11:20:15 -08:00

parent df48ab3c2f d42d610871

commit ed1741b77c

4 changed files with 9 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/watchdog/Kconfig

View file

2

drivers/watchdog/max63xx_wdt.c

View file

3

drivers/watchdog/pcwd_usb.c

View file

5

drivers/watchdog/sp805_wdt.c

View file