From 7310d079ac49721b2c7727529c9f6c746e8f183a Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 11 Jan 2014 16:06:37 +0000 Subject: kernel: update 3.10 to 3.10.26 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39220 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../0505-watchdog-add-MT7621-support.patch | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'target/linux/ramips/patches-3.10/0505-watchdog-add-MT7621-support.patch') diff --git a/target/linux/ramips/patches-3.10/0505-watchdog-add-MT7621-support.patch b/target/linux/ramips/patches-3.10/0505-watchdog-add-MT7621-support.patch index af02f92e25..b1d2da7766 100644 --- a/target/linux/ramips/patches-3.10/0505-watchdog-add-MT7621-support.patch +++ b/target/linux/ramips/patches-3.10/0505-watchdog-add-MT7621-support.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin 3 files changed, 193 insertions(+) create mode 100644 drivers/watchdog/mt7621_wdt.c -Index: linux-3.10.21/drivers/watchdog/Kconfig -=================================================================== ---- linux-3.10.21.orig/drivers/watchdog/Kconfig 2013-12-09 19:56:09.360682007 +0100 -+++ linux-3.10.21/drivers/watchdog/Kconfig 2013-12-09 19:59:20.636686594 +0100 -@@ -1116,7 +1116,14 @@ +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -1116,7 +1116,14 @@ config LANTIQ_WDT config RALINK_WDT tristate "Ralink SoC watchdog" select WATCHDOG_CORE @@ -31,11 +29,9 @@ Index: linux-3.10.21/drivers/watchdog/Kconfig help Hardware driver for the Ralink SoC Watchdog Timer. -Index: linux-3.10.21/drivers/watchdog/Makefile -=================================================================== ---- linux-3.10.21.orig/drivers/watchdog/Makefile 2013-12-09 19:56:09.360682007 +0100 -+++ linux-3.10.21/drivers/watchdog/Makefile 2013-12-09 19:56:09.752682016 +0100 -@@ -136,6 +136,7 @@ +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile +@@ -136,6 +136,7 @@ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o @@ -43,10 +39,8 @@ Index: linux-3.10.21/drivers/watchdog/Makefile # PARISC Architecture -Index: linux-3.10.21/drivers/watchdog/mt7621_wdt.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.21/drivers/watchdog/mt7621_wdt.c 2013-12-09 19:56:09.752682016 +0100 +--- /dev/null ++++ b/drivers/watchdog/mt7621_wdt.c @@ -0,0 +1,185 @@ +/* + * Ralink RT288x/RT3xxx/MT76xx built-in hardware watchdog timer -- cgit v1.2.3