diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
| commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch | |
| parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
| download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip | |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch b/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch index 009092376f..dd9f217309 100644 --- a/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch +++ b/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch @@ -20,12 +20,12 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> +#define TWD_WDOG_CONTROL_TIMER_MODE (0 << 3) +#define TWD_WDOG_CONTROL_WATCHDOG_MODE (1 << 3) + - struct clock_event_device; + #include <linux/ioport.h> - extern void __iomem *twd_base; + struct twd_local_timer { --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c -@@ -118,18 +118,25 @@ static void mpcore_wdt_stop(struct mpcor +@@ -121,18 +121,25 @@ static void mpcore_wdt_stop(struct mpcor static void mpcore_wdt_start(struct mpcore_wdt *wdt) { |