aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-01-31 15:08:26 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-01-31 15:08:26 +0000
commit999e9277ecb1f959e2043869e1442b6af93658b6 (patch)
tree0bc47489a9ecc689fcf36266786fac1bac23d1a7
parent038f0e6bbef7c352ffbd1abecbfeafb11d79d1e5 (diff)
downloadupstream-999e9277ecb1f959e2043869e1442b6af93658b6.tar.gz
upstream-999e9277ecb1f959e2043869e1442b6af93658b6.tar.bz2
upstream-999e9277ecb1f959e2043869e1442b6af93658b6.zip
Apply patch 210-remove_unnedded_variables.patch directly
SVN-Revision: 19455
-rw-r--r--target/linux/amazon/files/arch/mips/amazon/prom.c3
-rw-r--r--target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch12
2 files changed, 0 insertions, 15 deletions
diff --git a/target/linux/amazon/files/arch/mips/amazon/prom.c b/target/linux/amazon/files/arch/mips/amazon/prom.c
index c5db4f5cdc..28ef13b3d3 100644
--- a/target/linux/amazon/files/arch/mips/amazon/prom.c
+++ b/target/linux/amazon/files/arch/mips/amazon/prom.c
@@ -63,9 +63,6 @@ void __init prom_init(void)
int memsize = 16; /* assume 16M as default */
- mips_machgroup = MACH_GROUP_INFINEON;
- mips_machtype = MACH_INFINEON_AMAZON;
-
envp = (char **)KSEG1ADDR((unsigned long)envp);
while (*envp) {
char *e = (char *)KSEG1ADDR(*envp);
diff --git a/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch b/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch
deleted file mode 100644
index 3683a27325..0000000000
--- a/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/mips/amazon/prom.c
-+++ b/arch/mips/amazon/prom.c
-@@ -63,9 +63,6 @@ void __init prom_init(void)
-
- int memsize = 16; /* assume 16M as default */
-
-- mips_machgroup = MACH_GROUP_INFINEON;
-- mips_machtype = MACH_INFINEON_AMAZON;
--
- envp = (char **)KSEG1ADDR((unsigned long)envp);
- while (*envp) {
- char *e = (char *)KSEG1ADDR(*envp);