summaryrefslogtreecommitdiff
path: root/target/linux/atheros/patches-2.6.32/130-watchdog.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-14 13:22:38 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-14 13:22:38 +0000
commit93f85923e9ebb41b33223df0f07adc8afbdaa34a (patch)
treeba3a8b95b9ec2b98e80ffcde81e4e988c6b71ec7 /target/linux/atheros/patches-2.6.32/130-watchdog.patch
parentc057a8dbb693b6a7468b3159c507c1ab31fe4164 (diff)
atheros: refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20197 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.32/130-watchdog.patch')
-rw-r--r--target/linux/atheros/patches-2.6.32/130-watchdog.patch22
1 files changed, 8 insertions, 14 deletions
diff --git a/target/linux/atheros/patches-2.6.32/130-watchdog.patch b/target/linux/atheros/patches-2.6.32/130-watchdog.patch
index 0b917dd529..4d5e777cc2 100644
--- a/target/linux/atheros/patches-2.6.32/130-watchdog.patch
+++ b/target/linux/atheros/patches-2.6.32/130-watchdog.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.32.7/drivers/watchdog/ar2315-wtd.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.7/drivers/watchdog/ar2315-wtd.c 2010-02-03 17:01:46.074429108 +0100
+--- /dev/null
++++ b/drivers/watchdog/ar2315-wtd.c
@@ -0,0 +1,200 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -203,11 +201,9 @@ Index: linux-2.6.32.7/drivers/watchdog/ar2315-wtd.c
+
+module_init(init_ar2315_wdt);
+module_exit(exit_ar2315_wdt);
-Index: linux-2.6.32.7/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.32.7.orig/drivers/watchdog/Kconfig 2010-01-29 00:06:20.000000000 +0100
-+++ linux-2.6.32.7/drivers/watchdog/Kconfig 2010-02-03 17:01:46.078429135 +0100
-@@ -850,6 +850,12 @@
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -850,6 +850,12 @@ config TXX9_WDT
help
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
@@ -220,11 +216,9 @@ Index: linux-2.6.32.7/drivers/watchdog/Kconfig
# PARISC Architecture
# POWERPC Architecture
-Index: linux-2.6.32.7/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.32.7.orig/drivers/watchdog/Makefile 2010-01-29 00:06:20.000000000 +0100
-+++ linux-2.6.32.7/drivers/watchdog/Makefile 2010-02-03 17:01:46.078429135 +0100
-@@ -113,6 +113,7 @@
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o