mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
1a8218d6e4
This contains the following new bigger changes: * new partition parser which still could lake some features or have bugs * new nand flash driver * using physmap-flash flash driver for parallel flash * some changes to the serial flash driver With these changes OpenWrt starts using more of the mainline flash drivers. SVN-Revision: 35632
27 lines
849 B
Diff
27 lines
849 B
Diff
--- 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 bcm47xx_wdt_probe(struct plat
|
|
goto err_notifier;
|
|
|
|
pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
|
|
- wdt_time, nowayout ? ", nowayout" : "");
|
|
+ timeout, nowayout ? ", nowayout" : "");
|
|
return 0;
|
|
|
|
err_notifier:
|