aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches/520-rc32434_wdt.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 09:07:27 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 09:07:27 +0000
commit51e45450f185c839ecab7062facbecc7cff9953c (patch)
tree675bb9505d5b21c21728660ad33b68650541c206 /target/linux/rb532/patches/520-rc32434_wdt.patch
parentf40178918715dae3e42ecb7cb69f2f50819e6826 (diff)
downloadupstream-51e45450f185c839ecab7062facbecc7cff9953c.tar.gz
upstream-51e45450f185c839ecab7062facbecc7cff9953c.tar.bz2
upstream-51e45450f185c839ecab7062facbecc7cff9953c.zip
refresh kernel patches
SVN-Revision: 11203
Diffstat (limited to 'target/linux/rb532/patches/520-rc32434_wdt.patch')
-rw-r--r--target/linux/rb532/patches/520-rc32434_wdt.patch33
1 files changed, 18 insertions, 15 deletions
diff --git a/target/linux/rb532/patches/520-rc32434_wdt.patch b/target/linux/rb532/patches/520-rc32434_wdt.patch
index 7864d1536b..32ee23adb7 100644
--- a/target/linux/rb532/patches/520-rc32434_wdt.patch
+++ b/target/linux/rb532/patches/520-rc32434_wdt.patch
@@ -1,18 +1,20 @@
-diff -ur linux-2.6.22.4.old/arch/mips/kernel/time.c linux-2.6.22.4.new/arch/mips/kernel/time.c
---- linux-2.6.22.4.old/arch/mips/kernel/time.c 2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.22.4.new/arch/mips/kernel/time.c 2007-12-24 17:13:43.000000000 +0100
-@@ -478,3 +478,5 @@
+Index: linux-2.6.23.17/arch/mips/kernel/time.c
+===================================================================
+--- linux-2.6.23.17.orig/arch/mips/kernel/time.c
++++ linux-2.6.23.17/arch/mips/kernel/time.c
+@@ -479,3 +479,5 @@ EXPORT_SYMBOL(rtc_lock);
EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_mips_set_time);
EXPORT_SYMBOL(rtc_mips_get_time);
+EXPORT_SYMBOL(mips_hpt_frequency);
+
-diff -ur linux-2.6.22.4.old/drivers/char/watchdog/Kconfig linux-2.6.22.4.new/drivers/char/watchdog/Kconfig
---- linux-2.6.22.4.old/drivers/char/watchdog/Kconfig 2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.22.4.new/drivers/char/watchdog/Kconfig 2007-12-24 17:13:43.000000000 +0100
-@@ -575,6 +575,19 @@
- To compile this driver as a module, choose M here: the
- module will be called rm9k_wdt.
+Index: linux-2.6.23.17/drivers/char/watchdog/Kconfig
+===================================================================
+--- linux-2.6.23.17.orig/drivers/char/watchdog/Kconfig
++++ linux-2.6.23.17/drivers/char/watchdog/Kconfig
+@@ -647,6 +647,19 @@ config WATCHDOG_RTAS
+ To compile this driver as a module, choose M here. The module
+ will be called wdrtas.
+config RC32434_WDT
+ tristate "IDT Interprise 79RC32434 SoC hardware watchdog"
@@ -30,14 +32,15 @@ diff -ur linux-2.6.22.4.old/drivers/char/watchdog/Kconfig linux-2.6.22.4.new/dri
# S390 Architecture
config ZVM_WATCHDOG
-diff -ur linux-2.6.22.4.old/drivers/char/watchdog/Makefile linux-2.6.22.4.new/drivers/char/watchdog/Makefile
---- linux-2.6.22.4.old/drivers/char/watchdog/Makefile 2007-08-21 06:33:06.000000000 +0200
-+++ linux-2.6.22.4.new/drivers/char/watchdog/Makefile 2007-12-24 17:13:43.000000000 +0100
-@@ -75,6 +75,7 @@
+Index: linux-2.6.23.17/drivers/char/watchdog/Makefile
+===================================================================
+--- linux-2.6.23.17.orig/drivers/char/watchdog/Makefile
++++ linux-2.6.23.17/drivers/char/watchdog/Makefile
+@@ -90,6 +90,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
- # S390 Architecture
+ # PARISC Architecture