1 files changed, 17 insertions, 5 deletions

diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 9738cad4ba13..45e5babd3961 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -17,7 +17,6 @@
 #include <linux/pci.h>
 #include <linux/io.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
@@ -259,7 +258,10 @@ static int we_support_multiple_80211_cores(struct ssb_bus *bus)
 #ifdef CONFIG_SSB_PCIHOST
         if (bus->bustype == SSB_BUSTYPE_PCI) {
                 if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
-                    bus->host_pci->device == 0x4324)
+                    ((bus->host_pci->device == 0x4313) ||
+                     (bus->host_pci->device == 0x431A) ||
+                     (bus->host_pci->device == 0x4321) ||
+                     (bus->host_pci->device == 0x4324)))
                         return 1;
         }
 #endif /* CONFIG_SSB_PCIHOST */
@@ -308,7 +310,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
         } else {
                 if (bus->bustype == SSB_BUSTYPE_PCI) {
                         bus->chip_id = pcidev_to_chipid(bus->host_pci);
-                        pci_read_config_word(bus->host_pci, PCI_REVISION_ID,
+                        pci_read_config_byte(bus->host_pci, PCI_REVISION_ID,
                                              &bus->chip_rev);
                         bus->chip_package = 0;
                 } else {
@@ -406,10 +408,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
                                 /* Ignore PCI cores on PCI-E cards.
                                  * Ignore PCI-E cores on PCI cards. */
                                 if (dev->id.coreid == SSB_DEV_PCI) {
-                                        if (bus->host_pci->is_pcie)
+                                        if (pci_is_pcie(bus->host_pci))
                                                 continue;
                                 } else {
-                                        if (!bus->host_pci->is_pcie)
+                                        if (!pci_is_pcie(bus->host_pci))
                                                 continue;
                                 }
                         }
@@ -421,6 +423,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
                         bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
                         break;
+                case SSB_DEV_ETHERNET:
+                        if (bus->bustype == SSB_BUSTYPE_PCI) {
+                                if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
+                                    (bus->host_pci->device & 0xFF00) == 0x4300) {
+                                        /* This is a dangling ethernet core on a
+                                         * wireless device. Ignore it. */
+                                        continue;
+                                }
+                        }
+                        break;
                 default:
                         break;
                 }