diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 22:23:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 22:23:37 +0000 |
| commit | 6b5fcf103d4dfa99f02b44d0bb8bc7082c1d782f (patch) | |
| tree | f08b24169940a1a213fec6f0daaa1e2f595f6fc2 /target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch | |
| parent | 84720a93a178ed7975a19362f262645e31785f10 (diff) | |
| download | upstream-6b5fcf103d4dfa99f02b44d0bb8bc7082c1d782f.tar.gz upstream-6b5fcf103d4dfa99f02b44d0bb8bc7082c1d782f.tar.bz2 upstream-6b5fcf103d4dfa99f02b44d0bb8bc7082c1d782f.zip | |
bcm53xx: refresh kernel patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45426 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch b/target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch index c15114cc31..76123e972a 100644 --- a/target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch +++ b/target/linux/bcm53xx/patches-3.18/080-watchdog-bcm47xx_wdt.c-add-restart-handler-support.patch @@ -17,11 +17,9 @@ Signed-off-by: Wim Van Sebroeck <wim@iguana.be> include/linux/bcm47xx_wdt.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) -diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c -index 9816485..b28a072 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c -@@ -169,6 +169,17 @@ static int bcm47xx_wdt_notify_sys(struct notifier_block *this, +@@ -169,6 +169,17 @@ static int bcm47xx_wdt_notify_sys(struct return NOTIFY_DONE; } @@ -39,7 +37,7 @@ index 9816485..b28a072 100644 static struct watchdog_ops bcm47xx_wdt_soft_ops = { .owner = THIS_MODULE, .start = bcm47xx_wdt_soft_start, -@@ -209,15 +220,23 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) +@@ -209,15 +220,23 @@ static int bcm47xx_wdt_probe(struct plat if (ret) goto err_timer; @@ -64,8 +62,6 @@ index 9816485..b28a072 100644 err_notifier: unregister_reboot_notifier(&wdt->notifier); err_timer: -diff --git a/include/linux/bcm47xx_wdt.h b/include/linux/bcm47xx_wdt.h -index b708786..5582c21 100644 --- a/include/linux/bcm47xx_wdt.h +++ b/include/linux/bcm47xx_wdt.h @@ -16,6 +16,7 @@ struct bcm47xx_wdt { @@ -76,6 +72,3 @@ index b708786..5582c21 100644 struct timer_list soft_timer; atomic_t soft_ticks; --- -1.8.4.5 - |