brcm47xx: fix nvram read out on devices with serial flash

[openwrt.git] / target / linux / brcm47xx / patches-3.3 / 182-bcma-scan-for-extra-address-space.patch

diff --git a/target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch b/target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch
index 6e68f0cc8f7dd5d5ba5d5eaf692666c193e6251a..fdf5cfbe9d2a9c9d8b59874854800eb7bfcb5030 100644 (file)
--- a/target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch
+++ b/target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch
@@ -1,6 +1,6 @@
 --- a/drivers/bcma/scan.c
 +++ b/drivers/bcma/scan.c
-@@ -297,6 +297,23 @@ static int bcma_get_next_core(struct bcm
+@@ -323,6 +323,23 @@ static int bcma_get_next_core(struct bcm
                        return -EILSEQ;
        }
  
@@ -24,7 +24,7 @@
        /* get & parse slave ports */
        for (i = 0; i < ports[1]; i++) {
                for (j = 0; ; j++) {
-@@ -309,7 +326,7 @@ static int bcma_get_next_core(struct bcm
+@@ -335,7 +352,7 @@ static int bcma_get_next_core(struct bcm
                                break;
                        } else {
                                if (i == 0 && j == 0)
@@ -35,7 +35,7 @@
        }
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -139,6 +139,7 @@ struct bcma_device {
+@@ -144,6 +144,7 @@ struct bcma_device {
        u8 core_unit;
  
        u32 addr;