brcm63xx: allow bcm963xx and livebox support at the same time
[openwrt/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 533-board_rta770bw.patch
index 5e364c947a8ad773f75d6d61f40470c370b521ff..3922c78eeb6a93fa42fa5dd0af8649ce601d5261 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -790,6 +790,55 @@ static struct board_info __initdata boar
+@@ -758,6 +758,55 @@ static struct board_info __initdata boar
  
        .has_uart0                      = 1,
  };
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3262,6 +3311,7 @@ static const struct board_info __initcon
+@@ -3248,6 +3297,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,