diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:30:42 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:30:42 +0000 |
| commit | 4ee1d48f495829f9153bf6dae93fe090befe591c (patch) | |
| tree | d0486f6bcb4c6cac1c25d4787ca13885ef6bd7ad /target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch | |
| parent | c818073c4a312dc687e49a4981e013bff40b38d3 (diff) | |
| download | upstream-4ee1d48f495829f9153bf6dae93fe090befe591c.tar.gz upstream-4ee1d48f495829f9153bf6dae93fe090befe591c.tar.bz2 upstream-4ee1d48f495829f9153bf6dae93fe090befe591c.zip | |
brcm47xx: update bcma and ssb to master-2011-07-21
* add new patches for bcm4716 SoC
* add support for serial flash on bcma bus
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch index 824dd09c09..428582891e 100644 --- a/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch +++ b/target/linux/brcm47xx/patches-3.0/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch @@ -15,16 +15,16 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -30,6 +30,8 @@ - #include <linux/ssb/ssb.h> +@@ -31,6 +31,8 @@ #include <linux/ssb/ssb_embedded.h> #include <linux/bcma/bcma_soc.h> + #include <linux/platform_device.h> +#include <linux/serial.h> +#include <linux/serial_8250.h> #include <asm/bootinfo.h> #include <asm/reboot.h> #include <asm/time.h> -@@ -274,6 +276,31 @@ static int bcm47xx_get_invariants(struct +@@ -275,6 +277,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; -@@ -303,6 +330,10 @@ static void __init bcm47xx_register_ssb( +@@ -304,6 +331,10 @@ static void __init bcm47xx_register_ssb( memcpy(&mcore->serial_ports[1], &port, sizeof(port)); } } |