diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-02-16 20:28:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-02-16 20:28:24 +0000 |
| commit | 9f9982c1f703d0c9c8479c070e85ffdfeba72745 (patch) | |
| tree | 9cd4c6ee2a098198b1c7e71c44edaee49213080f /target/linux/brcm47xx/patches-3.8/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch | |
| parent | 452522c6deabe5ff993d2091c3c19266690ee49a (diff) | |
| download | upstream-9f9982c1f703d0c9c8479c070e85ffdfeba72745.tar.gz upstream-9f9982c1f703d0c9c8479c070e85ffdfeba72745.tar.bz2 upstream-9f9982c1f703d0c9c8479c070e85ffdfeba72745.zip | |
brcm47xx: add initial support for kernel 3.8
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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35632 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.8/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.8/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch b/target/linux/brcm47xx/patches-3.8/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch new file mode 100644 index 0000000000..f6dc76b988 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.8/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 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: |