diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-08-18 14:08:35 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-08-18 14:08:35 +0000 |
| commit | 9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6 (patch) | |
| tree | 84eef39c247956bd299478190f331661305b5958 /target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch | |
| parent | f4d6baf498a76f778ce56904b3be69e299bf3e30 (diff) | |
| download | upstream-9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6.tar.gz upstream-9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6.tar.bz2 upstream-9eaee85cc2d3abe7501cfe0ce70648ad07ce43e6.zip | |
make brcm47xx build only with bcma or only with ssb support.
There are some ifdefs missing so when only ssb or only bcma was
selected in the kernel config it did not build.
SVN-Revision: 33209
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch b/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch index 2b1516d27d..fd4befcfae 100644 --- a/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch +++ b/target/linux/brcm47xx/patches-3.3/024-brcm47xx-add-common-interface-for-sflash.patch @@ -9,7 +9,7 @@ obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o --- /dev/null +++ b/arch/mips/bcm47xx/bus.c -@@ -0,0 +1,82 @@ +@@ -0,0 +1,86 @@ +/* + * BCM947xx nvram variable access + * @@ -23,6 +23,7 @@ + +#include <bus.h> + ++#ifdef CONFIG_BCM47XX_BCMA +static int bcm47xx_sflash_bcma_read(struct bcm47xx_sflash *dev, u32 offset, u32 len, u8 *buf) +{ + return bcma_sflash_read(dev->bcc, offset, len, buf); @@ -57,7 +58,9 @@ + sflash->numblocks = bcc->sflash.numblocks; + sflash->size = bcc->sflash.size; +} ++#endif + ++#ifdef CONFIG_BCM47XX_SSB +static int bcm47xx_sflash_ssb_read(struct bcm47xx_sflash *dev, u32 offset, u32 len, u8 *buf) +{ + return ssb_sflash_read(dev->scc, offset, len, buf); @@ -92,6 +95,7 @@ + sflash->numblocks = scc->sflash.numblocks; + sflash->size = scc->sflash.size; +} ++#endif --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -43,6 +43,8 @@ EXPORT_SYMBOL(bcm47xx_bus); |