aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-10-20 10:32:44 +0000
committerJonas Gorski <jogo@openwrt.org>2011-10-20 10:32:44 +0000
commit23b3d9ba7435c52272283bf4d906634002c4d1d4 (patch)
treebadb10f376914e1eba5d0d1028a3bd45eae9f3f3 /target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
parentfa36a25a54fdb7317e383f911081886d272c66d5 (diff)
downloadupstream-23b3d9ba7435c52272283bf4d906634002c4d1d4.tar.gz
upstream-23b3d9ba7435c52272283bf4d906634002c4d1d4.tar.bz2
upstream-23b3d9ba7435c52272283bf4d906634002c4d1d4.zip
linux: generic: refresh patches for 3.1-rc10
Hopefully the last one and identical to final. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28492 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch')
-rw-r--r--target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
index 87c1c02ba9..17e855028a 100644
--- a/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
+++ b/target/linux/generic/patches-3.1/992-mpcore_wdt_fix_watchdog_counter_loading.patch
@@ -39,8 +39,8 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -142,3 +142,10 @@ void __cpuinit twd_timer_setup(struct cl
-
- clockevents_register_device(clk);
+ /* Make sure our local interrupt controller has this enabled */
+ gic_enable_ppi(clk->irq);
}
+
+/* Needed by mpcore_wdt */