diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-07-11 22:17:05 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-07-11 22:17:05 +0000 |
| commit | 5a4398b767c50c5b4d4b06039cee0e3e4d385dc1 (patch) | |
| tree | 6db3ab4140f379c58dd85215e4cde73cd37e079d /target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch | |
| parent | 8b47c2e55d96a474ad9b5907e7e4d303cc34a1d2 (diff) | |
| download | upstream-5a4398b767c50c5b4d4b06039cee0e3e4d385dc1.tar.gz upstream-5a4398b767c50c5b4d4b06039cee0e3e4d385dc1.tar.bz2 upstream-5a4398b767c50c5b4d4b06039cee0e3e4d385dc1.zip | |
kernel: bcma: update to version from wireless-testing tag master-2012-07-11
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32670 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 ed3392b88e..8f84bd2aba 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 */ |