X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F557-board_bcm963269bhr.patch;h=7a3cea57271efba2df84587c9ab2aed80db9f1ed;hb=b339304425b63073e8757cf104621279a5a38b5d;hp=c347d70e8a8c32549b132caf94bc2aa4e7b738f0;hpb=23df30ca4aa7849a75c2c3001a0c939b1af42217;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
index c347d70e8a..7a3cea5727 100644
--- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4499,6 +4499,75 @@ static struct board_info __initdata boar
- #endif
+@@ -4126,6 +4126,75 @@ static struct board_info __initdata boar
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
 + * known 63268/63269 boards
@@ -70,13 +70,13 @@
 +		},
 +	},
 +};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_63268 */
 +
 +/*
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4583,6 +4652,9 @@ static const struct board_info __initcon
+@@ -4206,6 +4275,9 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  #endif
@@ -85,4 +85,4 @@
 +#endif
  };
  
- static void __init boardid_fixup(u8 *boot_addr)
+ /*