diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-10 14:05:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-10 14:05:18 +0000 |
| commit | 885eea184225e2d190f7aa8742ac806034caa9fc (patch) | |
| tree | d60d951609d8e3a315c92b06a0670dc814525594 /target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch | |
| parent | a2950fabd4c84c867bf303e2e92bf99c2eb8b87a (diff) | |
| download | upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.gz upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.bz2 upstream-885eea184225e2d190f7aa8742ac806034caa9fc.zip | |
kernel: update bcma and ssb to master-2013-01-09 from wireless-testing
SVN-Revision: 35080
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 5acc2cf27b..98cd795a52 100644 --- 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 |