summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-12 21:23:29 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-12 21:23:29 +0000
commit70cdaf7073822dc4212e4869967f8d707203104d (patch)
tree52a83d916be9663de61caae99bfaf219e64650e9 /target/linux
parent057019f38a41c16b4f59c95d65fc2512100f4b2f (diff)
[brcm63xx] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23034 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/110-gpiodev.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.35/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.35/110-gpiodev.patch
index 99ee29f91..fc99f5345 100644
--- a/target/linux/brcm63xx/patches-2.6.35/110-gpiodev.patch
+++ b/target/linux/brcm63xx/patches-2.6.35/110-gpiodev.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -852,6 +852,10 @@ static struct platform_device mtd_dev =
+@@ -852,6 +852,10 @@ static struct platform_device mtd_dev =
.num_resources = ARRAY_SIZE(mtd_resources),
};
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 d9f7547fa..f9667b297 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
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -47,6 +47,13 @@ static unsigned int mac_addr_used;
+@@ -53,6 +53,13 @@ static unsigned int mac_addr_used;
static struct board_info board;
/*
@@ -14,7 +14,7 @@
* known 6338 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1387,6 +1394,7 @@ void __init board_prom_init(void)
+@@ -1403,6 +1410,7 @@ void __init board_prom_init(void)
/* extract nvram data */
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));