aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.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
commitd87efd8c3c2acd5d0f96b25514282a84f425419f (patch)
tree1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch
parent1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff)
downloadupstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch9
1 files changed, 0 insertions, 9 deletions
diff --git a/target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch b/target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch
index d2865eb7a4..a993c17662 100644
--- a/target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch
+++ b/target/linux/lantiq/patches-3.2/0058-MIPS-lantiq-falcon-VPE-softdog.patch
@@ -10,9 +10,6 @@ Subject: [PATCH 58/70] MIPS: lantiq: falcon VPE softdog
create mode 100644 arch/mips/include/asm/mach-lantiq/falcon/vpe.h
create mode 100644 arch/mips/lantiq/falcon/softdog_vpe.c
-diff --git a/arch/mips/include/asm/mach-lantiq/falcon/vpe.h b/arch/mips/include/asm/mach-lantiq/falcon/vpe.h
-new file mode 100644
-index 0000000..22a701b
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/falcon/vpe.h
@@ -0,0 +1,44 @@
@@ -60,9 +57,6 @@ index 0000000..22a701b
+int32_t vpe1_sw_wdog_register_reset_handler(VPE_SW_WDOG_RESET reset_fn);
+
+#endif
-diff --git a/arch/mips/lantiq/falcon/softdog_vpe.c b/arch/mips/lantiq/falcon/softdog_vpe.c
-new file mode 100644
-index 0000000..85d22a2
--- /dev/null
+++ b/arch/mips/lantiq/falcon/softdog_vpe.c
@@ -0,0 +1,109 @@
@@ -175,6 +169,3 @@ index 0000000..85d22a2
+MODULE_AUTHOR("LXDB");
+MODULE_DESCRIPTION("Software Watchdog For VPE1");
+MODULE_LICENSE("GPL");
---
-1.7.7.1
-