mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user