kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master...

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.8 / 060-ssb-add-serial-flash-driver.patch

diff --git a/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
index 6c17fb90a9caccad886bedfb065a52238e64fb1d..1148a489db6802cc6df1fc8d1884e73c97d1d964 100644 (file)
--- a/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
+++ b/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
@@ -296,7 +296,7 @@
  }
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -549,6 +549,15 @@ static int ssb_devices_register(struct s
+@@ -545,6 +545,15 @@ static int ssb_devices_register(struct s
                dev_idx++;
        }
  
@@ -314,7 +314,7 @@
                err = platform_device_register(&ssb_pflash_dev);
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
-@@ -220,6 +220,7 @@ extern u32 ssb_chipco_watchdog_timer_set
+@@ -231,6 +231,7 @@ extern u32 ssb_chipco_watchdog_timer_set
  /* driver_chipcommon_sflash.c */
  #ifdef CONFIG_SSB_SFLASH
  int ssb_sflash_init(struct ssb_chipcommon *cc);