aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-08 19:18:19 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-08 19:18:19 +0000
commit1200d62f668a1eac3123301eee1fc96613133409 (patch)
tree46023753eacf61fac40e0e4b3ee604b25e52d7f1 /target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch
parent27dee35f99ae1e4478d12461520e9aeab22f1169 (diff)
downloadupstream-1200d62f668a1eac3123301eee1fc96613133409.tar.gz
upstream-1200d62f668a1eac3123301eee1fc96613133409.tar.bz2
upstream-1200d62f668a1eac3123301eee1fc96613133409.zip
refresh 2.6.24 patches
SVN-Revision: 14452
Diffstat (limited to 'target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch')
-rw-r--r--target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch b/target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch
index 6e26237042..cfcf69777b 100644
--- a/target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch
+++ b/target/linux/rb532/patches-2.6.24/520-rc32434_wdt.patch
@@ -1,7 +1,6 @@
-diff -urN linux-2.6.24.7/arch/mips/kernel/time.c linux-2.6.24.7.new/arch/mips/kernel/time.c
---- linux-2.6.24.7/arch/mips/kernel/time.c 2008-05-07 01:22:34.000000000 +0200
-+++ linux-2.6.24.7.new/arch/mips/kernel/time.c 2008-07-15 15:38:33.000000000 +0200
-@@ -75,6 +75,7 @@
+--- a/arch/mips/kernel/time.c
++++ b/arch/mips/kernel/time.c
+@@ -75,6 +75,7 @@ EXPORT_SYMBOL(perf_irq);
*/
unsigned int mips_hpt_frequency;
@@ -9,10 +8,9 @@ diff -urN linux-2.6.24.7/arch/mips/kernel/time.c linux-2.6.24.7.new/arch/mips/ke
void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock)
{
-diff -urN linux-2.6.24.7/drivers/watchdog/Kconfig linux-2.6.24.7.new/drivers/watchdog/Kconfig
---- linux-2.6.24.7/drivers/watchdog/Kconfig 2008-05-07 01:22:34.000000000 +0200
-+++ linux-2.6.24.7.new/drivers/watchdog/Kconfig 2008-07-15 15:39:24.000000000 +0200
-@@ -639,6 +639,18 @@
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -639,6 +639,18 @@ config AR7_WDT
help
Hardware driver for the TI AR7 Watchdog Timer.