diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:51:02 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:51:02 +0000 |
commit | afbf3d994e57e06f8f5669033ab0e89af44e49c4 (patch) | |
tree | c94f0225aafe46c2716aa14d0f53941d81d40b8d /target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch | |
parent | 23578461a92aca344eb5d34d59352da3163281a8 (diff) | |
download | upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.gz upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.bz2 upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.zip |
kernel: update linux 3.3 to 3.3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31336 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch b/target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch index 1022450b67..605063fc23 100644 --- a/target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch +++ b/target/linux/lantiq/patches-3.3/0031-MIPS-lantiq-unify-xway-prom-code.patch @@ -18,8 +18,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 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.9.1 - |