diff options
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 | 20 |
1 files changed, 10 insertions, 10 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 419a4f6f1..824dd09c0 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 -@@ -29,6 +29,8 @@ - #include <linux/types.h> +@@ -30,6 +30,8 @@ #include <linux/ssb/ssb.h> #include <linux/ssb/ssb_embedded.h> + #include <linux/bcma/bcma_soc.h> +#include <linux/serial.h> +#include <linux/serial_8250.h> #include <asm/bootinfo.h> #include <asm/reboot.h> #include <asm/time.h> -@@ -247,6 +249,31 @@ static int bcm47xx_get_invariants(struct +@@ -274,6 +276,31 @@ static int bcm47xx_get_invariants(struct return 0; } @@ -53,17 +53,17 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +} +#endif + - void __init plat_mem_setup(void) + static void __init bcm47xx_register_ssb(void) { int err; -@@ -277,6 +304,10 @@ void __init plat_mem_setup(void) +@@ -303,6 +330,10 @@ static void __init bcm47xx_register_ssb( + memcpy(&mcore->serial_ports[1], &port, sizeof(port)); } } - ++ +#ifdef CONFIG_SERIAL_8250 + bcm47xx_early_serial_setup(mcore); +#endif -+ - _machine_restart = bcm47xx_machine_restart; - _machine_halt = bcm47xx_machine_halt; - pm_power_off = bcm47xx_machine_halt; + } + #endif + |