Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
This commit is contained in:
commit
db7ce76f6b
1 changed files with 3 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue