X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F557-board_bcm963269bhr.patch;h=caadafdfcb0285e517a3fffebd236963e261b6a3;hb=e490cc7e14d90c1e6fc4280cfc1af4b836533f09;hp=5c40a9f14bab3f33397562f3a7a10286f802a910;hpb=e5cadabb58808a0a65ca4a7530befc176b085646;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 5c40a9f14b..caadafdfcb 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
-@@ -4416,6 +4416,75 @@ static struct board_info __initdata boar
- #endif
+@@ -4121,6 +4121,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[] = {
-@@ -4500,6 +4569,9 @@ static const struct board_info __initcon
+@@ -4201,6 +4270,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)
+ /*