[brcm63xx] fix board patches so that new boards are withing appropriate ifdef

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.3 / 304-boardid_fixup.patch

diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index f5615294340e159106fbcb17010f1fd316d652f3..c8da9932d4433d5f320069dd78b5dd58ed943537 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.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

-@@ -29,12 +29,16 @@
+@@ -30,12 +30,16 @@

  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>


@@ -17,7 +17,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;

-@@ -725,6 +729,29 @@ static int board_get_mac_address(u8 *mac
+@@ -726,6 +730,29 @@ static int board_get_mac_address(u8 *mac

        return 0;
  }
  
        return 0;
  }
  


@@ -47,7 +47,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
  /*
   * early init callback, read nvram data from flash and checksum it
   */

-@@ -766,6 +793,11 @@ void __init board_prom_init(void)
+@@ -767,6 +794,11 @@ void __init board_prom_init(void)

                return;
        }
  
                return;
        }