diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2012-12-12 22:42:18 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-12-12 22:42:18 +0000 |
commit | c217abcbd6fa7162e8a7d1bc96b83f2d20c84658 (patch) | |
tree | 361f1acf0bb77a59cdddefa0a8427afb494fe932 /target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch | |
parent | 250a19d0bc77429ab41c2bf962895a0d00407722 (diff) | |
download | upstream-c217abcbd6fa7162e8a7d1bc96b83f2d20c84658.tar.gz upstream-c217abcbd6fa7162e8a7d1bc96b83f2d20c84658.tar.bz2 upstream-c217abcbd6fa7162e8a7d1bc96b83f2d20c84658.zip |
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34651 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch b/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch index 21136c0e3c..1765638b08 100644 --- a/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch +++ b/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch @@ -239,7 +239,7 @@ if (ret) { unregister_reboot_notifier(&bcm47xx_wdt_notifier); return ret; -@@ -292,10 +188,8 @@ static int __init bcm47xx_wdt_init(void) +@@ -292,10 +188,7 @@ static int __init bcm47xx_wdt_init(void) static void __exit bcm47xx_wdt_exit(void) { @@ -247,12 +247,11 @@ - bcm47xx_wdt_stop(); - - misc_deregister(&bcm47xx_wdt_miscdev); -+ watchdog_stop(&bcm47xx_wdt_wdd); + watchdog_unregister_device(&bcm47xx_wdt_wdd); unregister_reboot_notifier(&bcm47xx_wdt_notifier); } -@@ -306,4 +200,3 @@ module_exit(bcm47xx_wdt_exit); +@@ -306,4 +199,3 @@ module_exit(bcm47xx_wdt_exit); MODULE_AUTHOR("Aleksandar Radovanovic"); MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx"); MODULE_LICENSE("GPL"); |