---

yaml --- r: 231204 b: refs/heads/master c: ed70c6e h: refs/heads/master v: v3
git-mirror · Jan 10, 2011 · bab6ced · bab6ced
1 parent fbb7f28
commit bab6ced
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b5c5827d1f80ad8ae844a8b1183f59ddb90fe25
+refs/heads/master: ed70c6e60ee51b0fb46752ab4fd372a071da59d8
diff --git a/trunk/drivers/ssb/scan.c b/trunk/drivers/ssb/scan.c
@@ -420,6 +420,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;
 		}