kernel: update bcma and ssb to master-2013-01-09 from wireless-testing

[openwrt.git] / target / linux / brcm47xx / patches-3.6 / 116-MIPS-BCM47xx-Remove-CFE-console.patch

diff --git a/target/linux/brcm47xx/patches-3.6/116-MIPS-BCM47xx-Remove-CFE-console.patch b/target/linux/brcm47xx/patches-3.6/116-MIPS-BCM47xx-Remove-CFE-console.patch
index 8d2f7ca..f7ace42 100644 (file)
--- a/target/linux/brcm47xx/patches-3.6/116-MIPS-BCM47xx-Remove-CFE-console.patch
+++ b/target/linux/brcm47xx/patches-3.6/116-MIPS-BCM47xx-Remove-CFE-console.patch
@@ -17,16 +17,16 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 @@ -109,7 +109,6 @@ config BCM47XX
+       select IRQ_CPU
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
-       select GENERIC_GPIO
 -      select SYS_HAS_EARLY_PRINTK
        select CFE
        help
         Support for BCM47XX based boards
 --- a/arch/mips/bcm47xx/prom.c
 +++ b/arch/mips/bcm47xx/prom.c
-@@ -31,96 +31,28 @@
+@@ -33,96 +33,28 @@
  #include <asm/fw/cfe/cfe_api.h>
  #include <asm/fw/cfe/cfe_error.h>
  
@@ -130,7 +130,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  }
  
  static __init void prom_init_mem(void)
-@@ -161,8 +93,6 @@ static __init void prom_init_mem(void)
+@@ -173,8 +105,6 @@ static __init void prom_init_mem(void)
  void __init prom_init(void)
  {
        prom_init_cfe();