brcm63xx: allow bcm963xx and livebox support at the same time
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.14 / 508-board_hw553.patch
index 6247251b1ccd36c8067d8b2278f4abc463e7becd..3627ea5e8c1aa93f193c038754cfab35f536074f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1784,6 +1784,83 @@ static struct board_info __initdata boar
+@@ -1770,6 +1770,83 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -84,7 +84,7 @@
  #endif
  
  /*
-@@ -1832,6 +1909,7 @@ static const struct board_info __initcon
+@@ -1818,6 +1895,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,