kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.6 / 543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch
1 --- a/drivers/watchdog/bcm47xx_wdt.c
2 +++ b/drivers/watchdog/bcm47xx_wdt.c
3 @@ -32,11 +32,11 @@
4 #define WDT_DEFAULT_TIME 30 /* seconds */
5 #define WDT_SOFTTIMER_MAX 255 /* seconds */
6
7 -static int wdt_time = WDT_DEFAULT_TIME;
8 +static int timeout = WDT_DEFAULT_TIME;
9 static bool nowayout = WATCHDOG_NOWAYOUT;
10
11 -module_param(wdt_time, int, 0);
12 -MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
13 +module_param(timeout, int, 0);
14 +MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
15 __MODULE_STRING(WDT_DEFAULT_TIME) ")");
16
17 module_param(nowayout, bool, 0);
18 @@ -160,7 +160,7 @@ static int __devinit bcm47xx_wdt_probe(s
19 goto err_notifier;
20
21 pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n",
22 - wdt_time, nowayout ? ", nowayout" : "");
23 + timeout, nowayout ? ", nowayout" : "");
24 return 0;
25
26 err_notifier: