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/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch | |
| parent | d085aad2880f799cc09b03a3329635ad84551d3b (diff) | |
| download | mtk-20170518-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.zip mtk-20170518-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.gz mtk-20170518-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.bz2 | |
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/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch b/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch new file mode 100644 index 0000000..cbfa462 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch @@ -0,0 +1,26 @@ +--- a/drivers/watchdog/bcm47xx_wdt.c ++++ b/drivers/watchdog/bcm47xx_wdt.c +@@ -32,11 +32,11 @@ + #define WDT_DEFAULT_TIME 30 /* seconds */ + #define WDT_SOFTTIMER_MAX 255 /* seconds */ + +-static int wdt_time = WDT_DEFAULT_TIME; ++static int timeout = WDT_DEFAULT_TIME; + static bool nowayout = WATCHDOG_NOWAYOUT; + +-module_param(wdt_time, int, 0); +-MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default=" ++module_param(timeout, int, 0); ++MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default=" + __MODULE_STRING(WDT_DEFAULT_TIME) ")"); + + module_param(nowayout, bool, 0); +@@ -160,7 +160,7 @@ static int __devinit bcm47xx_wdt_probe(s + goto err_notifier; + + pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n", +- wdt_time, nowayout ? ", nowayout" : ""); ++ timeout, nowayout ? ", nowayout" : ""); + return 0; + + err_notifier: |