diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-03-03 01:40:24 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-03 01:40:24 +0100 |
| commit | db7ce76f6b3dfc119ab2f03e5e7784afc9cf2f05 (patch) | |
| tree | ec31336d5f6ee956e69074a9f3494c30bb053dfa /drivers/net/wireless | |
| parent | [AOE]: Add get_unaligned() calls where needed. (diff) | |
| parent | [PATCH] bcm43xx: fix for 4309 (diff) | |
| download | linux-db7ce76f6b3dfc119ab2f03e5e7784afc9cf2f05.tar.xz linux-db7ce76f6b3dfc119ab2f03e5e7784afc9cf2f05.zip | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 73c831a3b747..e594af46ff05 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -2733,8 +2733,9 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm) * dangling pins on the second core. Be careful * and ignore these cores here. */ - if (bcm->pci_dev->device != 0x4324) { - dprintk(KERN_INFO PFX "Ignoring additional 802.11 core.\n"); + if (1 /*bcm->pci_dev->device != 0x4324*/ ) { + /* TODO: A PHY */ + dprintk(KERN_INFO PFX "Ignoring additional 802.11a core.\n"); continue; } } |