diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-11 22:17:05 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-11 22:17:05 +0000 |
commit | 45d55161a671e58a0e86ab3b53a13ee958b76bc9 (patch) | |
tree | a771b6d6eef09fc2f85e63de1e6bfdd9e36cff82 /target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch | |
parent | d23e0491f025a7140202eaeef9e8f6936fb90fa4 (diff) | |
download | mtk-20170518-45d55161a671e58a0e86ab3b53a13ee958b76bc9.zip mtk-20170518-45d55161a671e58a0e86ab3b53a13ee958b76bc9.tar.gz mtk-20170518-45d55161a671e58a0e86ab3b53a13ee958b76bc9.tar.bz2 |
kernel: bcma: update to version from wireless-testing tag master-2012-07-11
SVN-Revision: 32670
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch index ed3392b..8f84bd2 100644 --- a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch +++ b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch @@ -239,7 +239,7 @@ bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h -@@ -47,6 +47,11 @@ u32 bcma_pmu_get_clockcpu(struct bcma_dr +@@ -56,6 +56,11 @@ u32 bcma_pmu_get_clockcpu(struct bcma_dr int bcma_sflash_init(struct bcma_drv_cc *cc); #endif /* CONFIG_BCMA_SFLASH */ @@ -971,7 +971,7 @@ +MODULE_DESCRIPTION("BCM47XX NAND flash driver"); --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -422,6 +422,7 @@ struct bcma_chipcommon_pmu { +@@ -436,6 +436,7 @@ struct bcma_chipcommon_pmu { enum bcma_flash_type { BCMA_PFLASH, BCMA_SFLASH, @@ -979,7 +979,7 @@ }; struct bcma_pflash { -@@ -438,6 +439,14 @@ struct bcma_sflash { +@@ -452,6 +453,14 @@ struct bcma_sflash { }; #endif /* CONFIG_BCMA_SFLASH */ @@ -994,7 +994,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -463,6 +472,9 @@ struct bcma_drv_cc { +@@ -477,6 +486,9 @@ struct bcma_drv_cc { #ifdef CONFIG_BCMA_SFLASH struct bcma_sflash sflash; #endif /* CONFIG_BCMA_SFLASH */ @@ -1004,7 +1004,7 @@ }; int nr_serial_ports; -@@ -528,4 +540,13 @@ int bcma_sflash_write(struct bcma_drv_cc +@@ -542,4 +554,13 @@ int bcma_sflash_write(struct bcma_drv_cc int bcma_sflash_erase(struct bcma_drv_cc *cc, u32 offset); #endif /* CONFIG_BCMA_SFLASH */ |