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

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;
                                 }
                         }