summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43legacy/main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-16 06:15:00 +0400
committerDavid S. Miller <davem@davemloft.net>2008-04-16 06:15:00 +0400
commitc4cbb34bbdaaa841ef7c027f7b420db4c318c4fd (patch)
tree90f40954097eb686752e03ad7088bd9191345132 /drivers/net/wireless/b43legacy/main.c
parent0517deed78be9cc9ce9799bf15da58fd0d2078bb (diff)
parentb358492cd2a9c67bff352c5a60d86e7fc9627477 (diff)
downloadlinux-c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-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 5f3f34e1dbfd..0f7a6e7bd96a 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1488,6 +1488,7 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev)
}
if (!fw->initvals) {
switch (dev->phy.type) {
+ case B43legacy_PHYTYPE_B:
case B43legacy_PHYTYPE_G:
if ((rev >= 5) && (rev <= 10))
filename = "b0g0initvals5";
@@ -1505,6 +1506,7 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev)
}
if (!fw->initvals_band) {
switch (dev->phy.type) {
+ case B43legacy_PHYTYPE_B:
case B43legacy_PHYTYPE_G:
if ((rev >= 5) && (rev <= 10))
filename = "b0g0bsinitvals5";