summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-17 13:22:38 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-17 13:22:38 +0000
commitb1e2eade9934f33c6593d23466ce9e3d069f4e9a (patch)
treea7ae1f7ae30e51d6ed5f93090e11b39cdbfabf68 /target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch
parentc343cde4928d4ba1ee1de82196b12b0ef97faa49 (diff)
kernel: ssb/bcma: update to version from wireless-testing tag master-2012-05-16-2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31772 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch6
1 files changed, 3 insertions, 3 deletions
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 6e68f0cc8..fdf5cfbe9 100644
--- 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;