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/071-bcma-add-functions-to-write-to-nand-flash.patch | |
| parent | a2950fabd4c84c867bf303e2e92bf99c2eb8b87a (diff) | |
| download | mtk-20170518-885eea184225e2d190f7aa8742ac806034caa9fc.zip mtk-20170518-885eea184225e2d190f7aa8742ac806034caa9fc.tar.gz mtk-20170518-885eea184225e2d190f7aa8742ac806034caa9fc.tar.bz2 | |
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/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 f1b4f7f..7a21298 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 -@@ -4,6 +4,7 @@ - #include <linux/platform_device.h> +@@ -5,6 +5,7 @@ + #include <linux/gpio.h> #include <linux/mtd/bcm47xx_sflash.h> +#include <linux/mtd/bcm47xx_nand.h> /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 -@@ -521,17 +522,6 @@ struct bcma_pflash { +@@ -522,17 +523,6 @@ struct bcma_pflash { }; @@ -207,7 +207,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -557,7 +547,7 @@ struct bcma_drv_cc { +@@ -558,7 +548,7 @@ struct bcma_drv_cc { struct bcm47xx_sflash sflash; #endif #ifdef CONFIG_BCMA_NFLASH @@ -216,7 +216,7 @@ #endif int nr_serial_ports; -@@ -616,4 +606,13 @@ extern void bcma_chipco_regctl_maskset(s +@@ -625,4 +615,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); |