kernel: update bcma and ssb to version master-2011-12-16 from wireless-testing

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 014-MIPS-BCM47xx-Setup-and-register-serial-early.patch

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 824dd09..0951644 100644 (file)
--- 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
 
 --- 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/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>
 +#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
+@@ -278,6 +280,31 @@ static int bcm47xx_get_invariants(struct

        return 0;
  }
  
        return 0;
  }
  


@@ -56,7 +56,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  static void __init bcm47xx_register_ssb(void)
  {
        int err;
  static void __init bcm47xx_register_ssb(void)
  {
        int err;

-@@ -303,6 +330,10 @@ static void __init bcm47xx_register_ssb(
+@@ -310,6 +337,10 @@ static void __init bcm47xx_register_ssb(

                        memcpy(&mcore->serial_ports[1], &port, sizeof(port));
                }
        }
                        memcpy(&mcore->serial_ports[1], &port, sizeof(port));
                }
        }