From 7e856e5a97966fe89f6336783c0c676eb999e7cf Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 24 Oct 2012 13:05:22 +0000 Subject: make all 3.6 patches apply and build SVN-Revision: 33911 --- .../generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch') 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 0090923..dd9f217 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 +#define TWD_WDOG_CONTROL_TIMER_MODE (0 << 3) +#define TWD_WDOG_CONTROL_WATCHDOG_MODE (1 << 3) + - struct clock_event_device; + #include - 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) { -- cgit v1.1