diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-13 19:35:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-13 19:35:40 +0000 |
| commit | 6af575967c780fa41029bdb64fdd68646ab516d1 (patch) | |
| tree | bf5fa402a077278c773200cb2aa941cc0b9e6883 /target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch | |
| parent | 3f240440c76765426018151ab3ea019547108326 (diff) | |
| download | mtk-20170518-6af575967c780fa41029bdb64fdd68646ab516d1.zip mtk-20170518-6af575967c780fa41029bdb64fdd68646ab516d1.tar.gz mtk-20170518-6af575967c780fa41029bdb64fdd68646ab516d1.tar.bz2 | |
kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing
SVN-Revision: 31278
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch b/target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch index cc76f83..6336f41 100644 --- a/target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch +++ b/target/linux/brcm47xx/patches-3.2/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 -@@ -46,6 +46,11 @@ u32 bcma_pmu_get_clockcpu(struct bcma_dr +@@ -47,6 +47,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 -@@ -376,6 +376,7 @@ struct bcma_chipcommon_pmu { +@@ -400,6 +400,7 @@ struct bcma_chipcommon_pmu { enum bcma_flash_type { BCMA_PFLASH, BCMA_SFLASH, @@ -979,7 +979,7 @@ }; struct bcma_pflash { -@@ -392,6 +393,14 @@ struct bcma_sflash { +@@ -416,6 +417,14 @@ struct bcma_sflash { }; #endif /* CONFIG_BCMA_SFLASH */ @@ -994,7 +994,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -417,6 +426,9 @@ struct bcma_drv_cc { +@@ -441,6 +450,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; -@@ -481,4 +493,13 @@ int bcma_sflash_write(struct bcma_drv_cc +@@ -505,4 +517,13 @@ int bcma_sflash_write(struct bcma_drv_cc int bcma_sflash_erase(struct bcma_drv_cc *cc, u32 offset); #endif /* CONFIG_BCMA_SFLASH */ |