kernel: move the bcma fallback sprom fix to generic

bcm63xx needs the bcma fallback sprom fix, too.

SVN-Revision: 33896

diff --git a/target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch b/target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
deleted file mode 100644 (file)
index b6e6480..0000000
--- a/target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/drivers/bcma/sprom.c
-+++ b/drivers/bcma/sprom.c
-@@ -591,8 +591,11 @@ int bcma_sprom_get(struct bcma_bus *bus)
-               bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
- 
-       err = bcma_sprom_valid(sprom);
--      if (err)
-+      if (err) {
-+              bcma_warn(bus, "invalid sprom read from the PCIe card, try to use fallback sprom\n");
-+              err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
-               goto out;
-+      }
- 
-       bcma_sprom_extract_r8(bus, sprom);
- 

diff --git a/target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch b/target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
new file mode 100644 (file)
index 0000000..b6e6480
--- /dev/null
+++ b/target/linux/generic/patches-3.3/029-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
@@ -0,0 +1,15 @@
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -591,8 +591,11 @@ int bcma_sprom_get(struct bcma_bus *bus)
+               bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
+ 
+       err = bcma_sprom_valid(sprom);
+-      if (err)
++      if (err) {
++              bcma_warn(bus, "invalid sprom read from the PCIe card, try to use fallback sprom\n");
++              err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
+               goto out;
++      }
+ 
+       bcma_sprom_extract_r8(bus, sprom);
+