[amazon] Apply patch 210-remove_unnedded_variables.patch directly

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19455 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/amazon/files/arch/mips/amazon/prom.c b/target/linux/amazon/files/arch/mips/amazon/prom.c
index c5db4f5..28ef13b 100644 (file)
--- 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 */
 
 
        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);
        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 (file)
index 3683a27..0000000
--- 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);