refresh 2.6.35 patches

SVN-Revision: 23652
This commit is contained in:
Florian Fainelli 2010-10-27 10:02:08 +00:00
parent cfe4c4a106
commit 7bf5647070
2 changed files with 3 additions and 3 deletions

View file

@ -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,

View file

@ -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));