diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-05-17 13:22:38 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-05-17 13:22:38 +0000 |
| commit | 273797f15a2ec0fc47cd88a92904a5712bd6539e (patch) | |
| tree | c6806b48609216e9a0e3f0d613471ac270fbc168 /target/linux/brcm47xx/patches-3.3/182-bcma-scan-for-extra-address-space.patch | |
| parent | 3491d8c01799eedc6bb00405d306b206242abe40 (diff) | |
| download | upstream-273797f15a2ec0fc47cd88a92904a5712bd6539e.tar.gz upstream-273797f15a2ec0fc47cd88a92904a5712bd6539e.tar.bz2 upstream-273797f15a2ec0fc47cd88a92904a5712bd6539e.zip | |
kernel: ssb/bcma: update to version from wireless-testing tag master-2012-05-16-2
SVN-Revision: 31772
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.patch | 6 |
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 6e68f0cc8f..fdf5cfbe9d 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; |