---

yaml --- r: 74731 b: refs/heads/master c: 3d72256 h: refs/heads/master i: 74729: fffdb7a 74727: d8e6e29 v: v3
git-mirror · Dec 7, 2007 · baaea5e · baaea5e
1 parent 92e5428
commit baaea5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bff713b562d495658093f1716a80c6ad76920e8b
+refs/heads/master: 3d722562d734834282bccd97e0badd213ec311e9
diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c
@@ -2550,6 +2550,10 @@ static int __devinit emac_probe(struct of_device *ofdev,
 	struct device_node **blist = NULL;
 	int err, i;
 
+	/* Skip unused/unwired EMACS */
+	if (of_get_property(np, "unused", NULL))
+		return -ENODEV;
+
 	/* Find ourselves in the bootlist if we are there */
 	for (i = 0; i < EMAC_BOOT_LIST_SIZE; i++)
 		if (emac_boot_list[i] == np)