[kernel] refresh 2.6.32 patches

[openwrt.git] / target / linux / brcm63xx / patches-2.6.35 / 300-wl_exports.patch

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 f9667b2..d88239c 100644 (file)
--- 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
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c

-@@ -53,6 +53,13 @@ static unsigned int mac_addr_used;
+@@ -49,6 +49,13 @@ static unsigned int mac_addr_used;

  static struct board_info board;
  
  /*
  static struct board_info board;
  
  /*


@@ -14,7 +14,7 @@
   * known 6338 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6338
   * known 6338 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6338

-@@ -1403,6 +1410,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));
  
        /* extract nvram data */
        memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));