aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43legacy/main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-18 02:56:30 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-18 02:56:30 -0400
commit1e42198609d73ed1a9adcba2af275c24c2678420 (patch)
tree32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /drivers/net/wireless/b43legacy/main.c
parent794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff)
parent4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
-rw-r--r--drivers/net/wireless/b43legacy/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 2422a5dab1d2..ef829ee8ffd4 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1516,6 +1516,7 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev)
1516 } 1516 }
1517 if (!fw->initvals) { 1517 if (!fw->initvals) {
1518 switch (dev->phy.type) { 1518 switch (dev->phy.type) {
1519 case B43legacy_PHYTYPE_B:
1519 case B43legacy_PHYTYPE_G: 1520 case B43legacy_PHYTYPE_G:
1520 if ((rev >= 5) && (rev <= 10)) 1521 if ((rev >= 5) && (rev <= 10))
1521 filename = "b0g0initvals5"; 1522 filename = "b0g0initvals5";
@@ -1533,6 +1534,7 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev)
1533 } 1534 }
1534 if (!fw->initvals_band) { 1535 if (!fw->initvals_band) {
1535 switch (dev->phy.type) { 1536 switch (dev->phy.type) {
1537 case B43legacy_PHYTYPE_B:
1536 case B43legacy_PHYTYPE_G: 1538 case B43legacy_PHYTYPE_G:
1537 if ((rev >= 5) && (rev <= 10)) 1539 if ((rev >= 5) && (rev <= 10))
1538 filename = "b0g0bsinitvals5"; 1540 filename = "b0g0bsinitvals5";