kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing

[openwrt/staging/yousong.git] / target / linux / brcm47xx / patches-3.3 / 061-ssb-register-parallel-flash-device.patch

diff --git a/target/linux/brcm47xx/patches-3.3/061-ssb-register-parallel-flash-device.patch b/target/linux/brcm47xx/patches-3.3/061-ssb-register-parallel-flash-device.patch
index 6e0d491842ed658b4d3441453bcbd82da0766572..b2f85ae656522b8621e8dac1847112ceafe525e7 100644 (file)
--- a/target/linux/brcm47xx/patches-3.3/061-ssb-register-parallel-flash-device.patch
+++ b/target/linux/brcm47xx/patches-3.3/061-ssb-register-parallel-flash-device.patch
@@ -50,7 +50,7 @@
  }
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -543,6 +543,14 @@ static int ssb_devices_register(struct s
+@@ -549,6 +549,14 @@ static int ssb_devices_register(struct s
                                   "Error registering serial flash\n");
        }
  #endif
@@ -67,7 +67,7 @@
  error:
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
-@@ -223,4 +223,6 @@ static inline int ssb_sflash_init(struct
+@@ -254,4 +254,6 @@ static inline int ssb_sflash_init(struct
  }
  #endif /* CONFIG_SSB_SFLASH */