diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-12 22:42:18 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-12 22:42:18 +0000 |
commit | 1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068 (patch) | |
tree | 3e1be3d06231d100c7133e2413cda80d9a74a9b8 /target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch | |
parent | d085aad2880f799cc09b03a3329635ad84551d3b (diff) | |
download | master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.gz master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.bz2 master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.zip |
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
SVN-Revision: 34651
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch index 27c6677209..f1b4f7feb7 100644 --- a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch +++ b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch @@ -181,15 +181,15 @@ +} --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -2,6 +2,7 @@ - #define LINUX_BCMA_DRIVER_CC_H_ +@@ -4,6 +4,7 @@ + #include <linux/platform_device.h> #include <linux/mtd/bcm47xx_sflash.h> +#include <linux/mtd/bcm47xx_nand.h> /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 -@@ -519,17 +520,6 @@ struct bcma_pflash { +@@ -521,17 +522,6 @@ struct bcma_pflash { }; @@ -207,7 +207,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -555,7 +545,7 @@ struct bcma_drv_cc { +@@ -557,7 +547,7 @@ struct bcma_drv_cc { struct bcm47xx_sflash sflash; #endif #ifdef CONFIG_BCMA_NFLASH @@ -216,7 +216,7 @@ #endif int nr_serial_ports; -@@ -613,4 +603,13 @@ extern void bcma_chipco_regctl_maskset(s +@@ -616,4 +606,13 @@ extern void bcma_chipco_regctl_maskset(s u32 offset, u32 mask, u32 set); extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid); |