aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-09-18 14:33:54 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-09-18 14:33:54 +0000
commit4c52ed50d73492f1e4a1443a9479abe5c938a552 (patch)
tree9bcad32299a04dd4463e0ee1f9cc8cc9309dde72 /target/linux/brcm47xx/patches-3.10/830-huawei_e970_support.patch
parente75ff873bedc7103c0317d25d8dcbc988af8c3d5 (diff)
downloadupstream-4c52ed50d73492f1e4a1443a9479abe5c938a552.tar.gz
upstream-4c52ed50d73492f1e4a1443a9479abe5c938a552.tar.bz2
upstream-4c52ed50d73492f1e4a1443a9479abe5c938a552.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> SVN-Revision: 38036
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
}