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

Browse source

Pull watchdog fixes from Wim Van Sebroeck:
 "This fixes:

   - module autoload for 3 OF platform drivers
   - poweroff behaviour on bcm2835 watchdog device
   - I2C dependencies for iTCO_wdt.c"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO: Fix dependencies on I2C
  watchdog: bcm2835: Fix poweroff behaviour
  watchdog: Fix module autoload for OF platform driver

...

This commit is contained in:

Linus Torvalds 2015-09-30 13:13:55 -04:00

parent d4e842be2b 3cef072d3b

commit dd36d7393d

5 changed files with 13 additions and 3 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

3

drivers/watchdog/Kconfig

View file

10

drivers/watchdog/bcm2835_wdt.c

View file

1

drivers/watchdog/gef_wdt.c

View file

1

drivers/watchdog/mena21_wdt.c

View file

1

drivers/watchdog/moxart_wdt.c

View file