diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-10-25 14:33:47 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-10-25 14:33:47 +0000 |
| commit | 183c8129ef4ca3a21994a111118fa12fd9e782d2 (patch) | |
| tree | bbbcac3fb6d358126698f3764c562345b210dc9c /target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch | |
| parent | 1e4b9a79ca1101e33c630e1d0b53611e01baba38 (diff) | |
| download | upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.tar.gz upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.tar.bz2 upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.zip | |
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma
* do some misc enhancements to the flash drivers for bcm47xx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33920 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 10 |
1 files changed, 5 insertions, 5 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 9013972375..5e324e473b 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 @@ -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 -@@ -33,6 +33,8 @@ +@@ -31,6 +31,8 @@ + #include <linux/ssb/ssb.h> #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> -@@ -152,6 +154,31 @@ static int bcm47xx_get_invariants(struct +@@ -121,6 +123,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; -@@ -184,6 +211,10 @@ static void __init bcm47xx_register_ssb( +@@ -150,6 +177,10 @@ static void __init bcm47xx_register_ssb( memcpy(&mcore->serial_ports[1], &port, sizeof(port)); } } @@ -65,5 +65,5 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + bcm47xx_early_serial_setup(mcore); +#endif } + #endif - static int __init bcm47xx_register_flash_ssb(void) |