refresh 2.6.35 patches

SVN-Revision: 23034
owl
Florian Fainelli 2010-09-12 21:23:29 +00:00
parent ed008fe1e8
commit fab2e77357
2 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/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), .num_resources = ARRAY_SIZE(mtd_resources),
}; };

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/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; static struct board_info board;
/* /*
@ -14,7 +14,7 @@
* known 6338 boards * known 6338 boards
*/ */
#ifdef CONFIG_BCM63XX_CPU_6338 #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 */ /* extract nvram data */
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram)); memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));