Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db7ce76f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' of... 

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

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -2733,8 +2733,9 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm) 
				 * dangling pins on the second core. Be careful

				 * dangling pins on the second core. Be careful

				 * and ignore these cores here.

				 * and ignore these cores here.

				 */

				 */

				if (bcm->pci_dev->device != 0x4324) {

				if (1 /*bcm->pci_dev->device != 0x4324*/ ) {

					dprintk(KERN_INFO PFX "Ignoring additional 802.11 core.\n");

				/* TODO: A PHY */

					dprintk(KERN_INFO PFX "Ignoring additional 802.11a core.\n");

					continue;

					continue;

				}

				}

			}

			}