X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fpatches-3.10%2F830-huawei_e970_support.patch;h=5e8a2cb4619020fd5dffa433783821e477aff8f8;hb=b82d0dc241632d33e8208c35dafae017fc872c6e;hp=12539fd9be45055fcd1453e0577787202a9c4cc7;hpb=d78a74343c28645deba705fc7cc2faa5f6cdeab7;p=openwrt.git

diff --git a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
index 12539fd9be..5e8a2cb461 100644
--- a/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
+++ b/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
@@ -1,21 +1,15 @@
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -33,11 +33,13 @@
+@@ -33,6 +33,7 @@
  #include <linux/bcma/bcma_soc.h>
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
 +#include <linux/gpio_wdt.h>
  #include <asm/bootinfo.h>
+ #include <asm/prom.h>
  #include <asm/reboot.h>
- #include <asm/time.h>
- #include <bcm47xx.h>
- #include <bcm47xx_nvram.h>
-+#include <bcm47xx_board.h>
- 
- union bcm47xx_bus bcm47xx_bus;
- EXPORT_SYMBOL(bcm47xx_bus);
-@@ -254,6 +256,33 @@ void __init plat_mem_setup(void)
- 	pm_power_off = bcm47xx_machine_halt;
+@@ -260,6 +261,33 @@ void __init plat_mem_setup(void)
+ 	mips_set_machine_name(bcm47xx_board_get_name());
  }
  
 +static struct gpio_wdt_platform_data gpio_wdt_data;
@@ -48,7 +42,7 @@
  static int __init bcm47xx_register_bus_complete(void)
  {
  	switch (bcm47xx_bus_type) {
-@@ -268,6 +297,8 @@ static int __init bcm47xx_register_bus_c
+@@ -274,6 +302,8 @@ static int __init bcm47xx_register_bus_c
  		break;
  #endif
  	}