tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

Jeff Garzik db7ce76f 43ecf529

+3 -2
unified split
+3 -2
drivers/net/wireless/bcm43xx/bcm43xx_main.c
··· 2733 * dangling pins on the second core. Be careful 2734 * and ignore these cores here. 2735 */ 2736 - if (bcm->pci_dev->device != 0x4324) { 2737 - dprintk(KERN_INFO PFX "Ignoring additional 802.11 core.\n"); 2738 continue; 2739 } 2740 }
··· 2733 * dangling pins on the second core. Be careful 2734 * and ignore these cores here. 2735 */ 2736 + if (1 /*bcm->pci_dev->device != 0x4324*/ ) { 2737 + /* TODO: A PHY */ 2738 + dprintk(KERN_INFO PFX "Ignoring additional 802.11a core.\n"); 2739 continue; 2740 } 2741 }