aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/amazon
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-01-31 15:08:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-01-31 15:08:26 +0000
commit964a2654b81ee81484265517e30d918a5b58ecb1 (patch)
tree8eae193f3505c58276598a85a88052de4f7c2927 /target/linux/amazon
parent7e559eb18b9057f2b6c663f2519ad624fba5cabb (diff)
downloadupstream-964a2654b81ee81484265517e30d918a5b58ecb1.tar.gz
upstream-964a2654b81ee81484265517e30d918a5b58ecb1.tar.bz2
upstream-964a2654b81ee81484265517e30d918a5b58ecb1.zip
[amazon] Apply patch 210-remove_unnedded_variables.patch directly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19455 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/amazon')
-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);