summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-27 10:02:08 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-27 10:02:08 +0000
commit944809a05e2aeabced1eb950ad5eb238e937ff4b (patch)
treef7914789ae477a98e5b89ff99ac4903801998e64 /target
parent2c6502bc88ad2f7e6e1f0f1d90f8bedc645f8eac (diff)
[brcm63xx] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23652 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch
index edd5139b53..166123f42f 100644
--- a/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -122,6 +122,38 @@
+@@ -135,6 +135,38 @@ static struct board_info __initdata boar
},
},
};
@@ -39,7 +39,7 @@
#endif
/*
-@@ -760,6 +798,7 @@
+@@ -1273,6 +1305,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,
diff --git a/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch b/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch
index 2c336c86c3..d88239cd97 100644
--- a/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch
@@ -14,7 +14,7 @@
* known 6338 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1420,6 +1427,7 @@ void __init board_prom_init(void)
+@@ -1453,6 +1460,7 @@ void __init board_prom_init(void)
/* extract nvram data */
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));