diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-22 15:18:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-22 15:18:06 -0400 |
| commit | a0d0d1685f9763ab26a394df3ab84026b39a06a7 (patch) | |
| tree | 4165dc6fd3266977ab4b3fa3b379c47597f97d88 /drivers/net/wireless/b43legacy/phy.c | |
| parent | 31a67102f4762df5544bc2dfb34a931233d2a5b2 (diff) | |
| parent | 05f8f25276ea8c7d41b3649890d6eaf179e67a81 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/b43legacy/phy.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c index 950334197f40..995c7d0c212a 100644 --- a/drivers/net/wireless/b43legacy/phy.c +++ b/drivers/net/wireless/b43legacy/phy.c | |||
| @@ -408,7 +408,7 @@ static void b43legacy_phy_setupg(struct b43legacy_wldev *dev) | |||
| 408 | 408 | ||
| 409 | if (is_bcm_board_vendor(dev) && | 409 | if (is_bcm_board_vendor(dev) && |
| 410 | (dev->dev->bus->boardinfo.type == 0x0416) && | 410 | (dev->dev->bus->boardinfo.type == 0x0416) && |
| 411 | (dev->dev->bus->boardinfo.rev == 0x0017)) | 411 | (dev->dev->bus->sprom.board_rev == 0x0017)) |
| 412 | return; | 412 | return; |
| 413 | 413 | ||
| 414 | b43legacy_ilt_write(dev, 0x5001, 0x0002); | 414 | b43legacy_ilt_write(dev, 0x5001, 0x0002); |
| @@ -424,7 +424,7 @@ static void b43legacy_phy_setupg(struct b43legacy_wldev *dev) | |||
| 424 | 424 | ||
| 425 | if (is_bcm_board_vendor(dev) && | 425 | if (is_bcm_board_vendor(dev) && |
| 426 | (dev->dev->bus->boardinfo.type == 0x0416) && | 426 | (dev->dev->bus->boardinfo.type == 0x0416) && |
| 427 | (dev->dev->bus->boardinfo.rev == 0x0017)) | 427 | (dev->dev->bus->sprom.board_rev == 0x0017)) |
| 428 | return; | 428 | return; |
| 429 | 429 | ||
| 430 | b43legacy_ilt_write(dev, 0x0401, 0x0002); | 430 | b43legacy_ilt_write(dev, 0x0401, 0x0002); |