aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-08-14 21:23:36 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-08-14 21:23:36 +0000
commite7352b39efba63e89c0daa4fae6de3b0139c1e06 (patch)
tree6479da4f8f5fd2f38da28c591e6c337690f30c5e /target/linux/brcm47xx/patches-3.10
parentbbc967b11aecac465a9917ad83c679d018de8b96 (diff)
downloadupstream-e7352b39efba63e89c0daa4fae6de3b0139c1e06.tar.gz
upstream-e7352b39efba63e89c0daa4fae6de3b0139c1e06.tar.bz2
upstream-e7352b39efba63e89c0daa4fae6de3b0139c1e06.zip
BB: brcm47xx: fix brcm47xx.legacy build
we should check for ssb here. backport of r42164. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42166 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10')
-rw-r--r--target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch b/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
index f1a343a0cc..50431de040 100644
--- a/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
+++ b/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
@@ -25,10 +25,10 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB:
-+ if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785)
++ if (bcm47xx_bus.ssb.chip_id == 0x4785)
+ write_c0_diag4(1 << 22);
ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
-+ if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785) {
++ if (bcm47xx_bus.ssb.chip_id == 0x4785) {
+ __asm__ __volatile__(
+ ".set\tmips3\n\t"
+ "sync\n\t"