diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-03-08 11:05:10 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-03-08 11:05:10 +0000 |
| commit | baf0b1865376bcc753f28c0b9f6e1a152e021fe9 (patch) | |
| tree | 92e589d6df02be5bc318c334dcbb69b9ffaa7c2e /target/linux/bcm53xx/files | |
| parent | 81edbe39b86a5944407ea34b75dcdc8830bccbcf (diff) | |
| download | upstream-baf0b1865376bcc753f28c0b9f6e1a152e021fe9.tar.gz upstream-baf0b1865376bcc753f28c0b9f6e1a152e021fe9.tar.bz2 upstream-baf0b1865376bcc753f28c0b9f6e1a152e021fe9.zip | |
bcm53xx: update bcm47xx_sprom to the latest 4.6 queued version
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 48963
Diffstat (limited to 'target/linux/bcm53xx/files')
| -rw-r--r-- | target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c b/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c index 5dfd4593da..b6eb875d4a 100644 --- a/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c +++ b/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c @@ -601,7 +601,7 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix, bcm47xx_sprom_fill_auto(sprom, prefix, fallback); } -#if defined(CONFIG_SSB_SPROM) +#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM) static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out) { char prefix[10]; @@ -624,7 +624,7 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out) } #endif -#if defined(CONFIG_BCMA) +#if IS_BUILTIN(CONFIG_BCMA) /* * Having many NVRAM entries for PCI devices led to repeating prefixes like * pci/1/1/ all the time and wasting flash space. So at some point Broadcom @@ -719,14 +719,14 @@ int bcm47xx_sprom_register_fallbacks(void) if (bcm47xx_sprom_registered) return 0; -#if defined(CONFIG_SSB_SPROM) +#if IS_BUILTIN(CONFIG_SSB) && IS_ENABLED(CONFIG_SSB_SPROM) if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb)) - pr_warn("Failed to registered ssb SPROM handler\n"); + pr_warn("Failed to register ssb SPROM handler\n"); #endif -#if defined(CONFIG_BCMA) +#if IS_BUILTIN(CONFIG_BCMA) if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma)) - pr_warn("Failed to registered bcma SPROM handler\n"); + pr_warn("Failed to register bcma SPROM handler\n"); #endif bcm47xx_sprom_registered = 1; |