diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-12 22:42:18 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-12 22:42:18 +0000 |
commit | 1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068 (patch) | |
tree | 3e1be3d06231d100c7133e2413cda80d9a74a9b8 /target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch | |
parent | d085aad2880f799cc09b03a3329635ad84551d3b (diff) | |
download | master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.gz master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.bz2 master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.zip |
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
SVN-Revision: 34651
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"); |