aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
commitd944e45d6535953d8fa3349e5230a6eecb7e9ecb (patch)
treeaf668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch
parent49fec54fecdd0290325dbf1c29f30781ede28b8e (diff)
downloadupstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.gz
upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.bz2
upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.zip
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch b/target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch
index 8eb401d296..284d2487c1 100644
--- a/target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch
+++ b/target/linux/lantiq/patches-3.2/0034-WDT-MIPS-lantiq-convert-watchdog-driver-to-clkdev-ap.patch
@@ -12,11 +12,9 @@ Cc: linux-watchdog@vger.kernel.org
drivers/watchdog/lantiq_wdt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
-index 179bf98..da2b09f 100644
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
-@@ -206,7 +206,7 @@ ltq_wdt_probe(struct platform_device *pdev)
+@@ -206,7 +206,7 @@ ltq_wdt_probe(struct platform_device *pd
}
/* we do not need to enable the clock as it is always running */
@@ -25,6 +23,3 @@ index 179bf98..da2b09f 100644
WARN_ON(!clk);
ltq_io_region_clk_rate = clk_get_rate(clk);
clk_put(clk);
---
-1.7.7.1
-