summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.2/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.2/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch b/target/linux/brcm47xx/patches-3.2/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch
deleted file mode 100644
index abc638d24..000000000
--- a/target/linux/brcm47xx/patches-3.2/060-bcma-use-fallback-sprom-if-no-on-chip-sprom-is-avail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/bcma/sprom.c
-+++ b/drivers/bcma/sprom.c
-@@ -404,16 +404,19 @@ int bcma_sprom_get(struct bcma_bus *bus)
- return -EOPNOTSUPP;
-
- if (!bcma_sprom_ext_available(bus)) {
-+ bool sprom_onchip;
-+
- /*
- * External SPROM takes precedence so check
- * on-chip OTP only when no external SPROM
- * is present.
- */
-- if (bcma_sprom_onchip_available(bus)) {
-+ sprom_onchip = bcma_sprom_onchip_available(bus);
-+ if (sprom_onchip) {
- /* determine offset */
- offset = bcma_sprom_onchip_offset(bus);
- }
-- if (!offset) {
-+ if (!offset || !sprom_onchip) {
- /*
- * Maybe there is no SPROM on the device?
- * Now we ask the arch code if there is some sprom