aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-09-18 14:33:54 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-09-18 14:33:54 +0000
commit3d8f232fdab46b60d14a8a02a7fd22790963ac99 (patch)
tree8892d0b0f3d1c661f19176ad1b760cd39ec9a96c /target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
parentdf9cbcd450a89878e9e882a8dd442c0b3febd6c5 (diff)
downloadmaster-187ad058-3d8f232fdab46b60d14a8a02a7fd22790963ac99.tar.gz
master-187ad058-3d8f232fdab46b60d14a8a02a7fd22790963ac99.tar.bz2
master-187ad058-3d8f232fdab46b60d14a8a02a7fd22790963ac99.zip
brcm47xx: update board detection patches
This is now the version which was send for mainline Linux kernel inclusion. The data needed to detection a board is now stored in init data. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38036 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch6
1 files changed, 3 insertions, 3 deletions
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..19adf6ff10 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
@@ -14,8 +14,8 @@
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;
+@@ -255,6 +257,33 @@ void __init plat_mem_setup(void)
+ bcm47xx_board_detect();
}
+static struct gpio_wdt_platform_data gpio_wdt_data;
@@ -48,7 +48,7 @@
static int __init bcm47xx_register_bus_complete(void)
{
switch (bcm47xx_bus_type) {
-@@ -268,6 +297,8 @@ static int __init bcm47xx_register_bus_c
+@@ -269,6 +298,8 @@ static int __init bcm47xx_register_bus_c
break;
#endif
}