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

[librecmc/librecmc.git] / target / linux / brcm47xx / patches-3.6 / 070-bcma-add-functions-to-write-to-serial-flash.patch

diff --git a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
index 5acc2cf27bd524206ec11dd2c9abfe322e6e8dba..98cd795a5260b40871ecb5dc775e9d4afab818f9 100644 (file)
--- a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
+++ b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
@@ -307,16 +307,16 @@
                  e->name, sflash->size / 1024, sflash->blocksize,
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -3,6 +3,8 @@
- 
+@@ -4,6 +4,8 @@
  #include <linux/platform_device.h>
+ #include <linux/gpio.h>
  
 +#include <linux/mtd/bcm47xx_sflash.h>
 +
  /** ChipCommon core registers. **/
  #define BCMA_CC_ID                    0x0000
  #define  BCMA_CC_ID_ID                        0x0000FFFF
-@@ -518,17 +520,6 @@ struct bcma_pflash {
+@@ -519,17 +521,6 @@ struct bcma_pflash {
        u32 window_size;
  };
  
@@ -334,7 +334,7 @@
  
  #ifdef CONFIG_BCMA_NFLASH
  struct mtd_info;
-@@ -563,7 +554,7 @@ struct bcma_drv_cc {
+@@ -564,7 +555,7 @@ struct bcma_drv_cc {
  #ifdef CONFIG_BCMA_DRIVER_MIPS
        struct bcma_pflash pflash;
  #ifdef CONFIG_BCMA_SFLASH