From d944e45d6535953d8fa3349e5230a6eecb7e9ecb Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 1 Apr 2012 07:56:55 +0000 Subject: 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 --- .../0035-MIPS-lantiq-unify-xway-prom-code.patch | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'target/linux/lantiq/patches-3.2/0035-MIPS-lantiq-unify-xway-prom-code.patch') diff --git a/target/linux/lantiq/patches-3.2/0035-MIPS-lantiq-unify-xway-prom-code.patch b/target/linux/lantiq/patches-3.2/0035-MIPS-lantiq-unify-xway-prom-code.patch index 69a0ffb417..736abfed29 100644 --- a/target/linux/lantiq/patches-3.2/0035-MIPS-lantiq-unify-xway-prom-code.patch +++ b/target/linux/lantiq/patches-3.2/0035-MIPS-lantiq-unify-xway-prom-code.patch @@ -18,8 +18,6 @@ Signed-off-by: John Crispin delete mode 100644 arch/mips/lantiq/xway/prom-xway.c create mode 100644 arch/mips/lantiq/xway/prom.c -diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile -index 4dcb96f..9d1a0a2 100644 --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile @@ -1,7 +1,4 @@ @@ -31,9 +29,6 @@ index 4dcb96f..9d1a0a2 100644 obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o -diff --git a/arch/mips/lantiq/xway/Makefile.rej b/arch/mips/lantiq/xway/Makefile.rej -deleted file mode 100644 -index c0d5b52..0000000 --- a/arch/mips/lantiq/xway/Makefile.rej +++ /dev/null @@ -1,11 +0,0 @@ @@ -48,9 +43,6 @@ index c0d5b52..0000000 - - obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o - obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o -diff --git a/arch/mips/lantiq/xway/prom-ase.c b/arch/mips/lantiq/xway/prom-ase.c -deleted file mode 100644 -index 3f86a3b..0000000 --- a/arch/mips/lantiq/xway/prom-ase.c +++ /dev/null @@ -1,48 +0,0 @@ @@ -102,9 +94,6 @@ index 3f86a3b..0000000 - ltq_register_gpio(); - ltq_register_wdt(); -} -diff --git a/arch/mips/lantiq/xway/prom-xway.c b/arch/mips/lantiq/xway/prom-xway.c -deleted file mode 100644 -index d823a92..0000000 --- a/arch/mips/lantiq/xway/prom-xway.c +++ /dev/null @@ -1,64 +0,0 @@ @@ -172,9 +161,6 @@ index d823a92..0000000 - ltq_register_gpio(); - ltq_register_wdt(); -} -diff --git a/arch/mips/lantiq/xway/prom.c b/arch/mips/lantiq/xway/prom.c -new file mode 100644 -index 0000000..0929acb --- /dev/null +++ b/arch/mips/lantiq/xway/prom.c @@ -0,0 +1,79 @@ @@ -257,6 +243,3 @@ index 0000000..0929acb + ltq_register_gpio(); + ltq_register_wdt(); +} --- -1.7.7.1 - -- cgit v1.2.3