aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-08-18 14:08:35 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-08-18 14:08:35 +0000
commit9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6 (patch)
tree84eef39c247956bd299478190f331661305b5958 /target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
parentf4d6baf498a76f778ce56904b3be69e299bf3e30 (diff)
downloadupstream-9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6.tar.gz
upstream-9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6.tar.bz2
upstream-9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6.zip
make brcm47xx build only with bcma or only with ssb support.
There are some ifdefs missing so when only ssb or only bcma was selected in the kernel config it did not build. SVN-Revision: 33209
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index 3d1f5660fa..9013972375 100644
--- a/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -24,7 +24,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/time.h>
-@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
+@@ -152,6 +154,31 @@ static int bcm47xx_get_invariants(struct
return 0;
}
@@ -56,7 +56,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static void __init bcm47xx_register_ssb(void)
{
int err;
-@@ -198,6 +225,10 @@ static void __init bcm47xx_register_ssb(
+@@ -184,6 +211,10 @@ static void __init bcm47xx_register_ssb(
memcpy(&mcore->serial_ports[1], &port, sizeof(port));
}
}