From baaea5ec16dcfad4e4b25b7dbc0deb53523208f7 Mon Sep 17 00:00:00 2001
From: Hugh Blemings <hugh@blemings.org>
Date: Wed, 5 Dec 2007 11:14:30 +1100
Subject: [PATCH] --- yaml --- r: 74731 b: refs/heads/master c:
 3d722562d734834282bccd97e0badd213ec311e9 h: refs/heads/master i:   74729:
 fffdb7a71ced5ffd7aea850413bb8b13a275790e   74727:
 d8e6e29b194d793684c2ebda73c6e798cce6450f v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ibm_newemac/core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac80d6c23c2e..710ec55b51af 100644
--- 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
index ac9fd46509c1..a77207f19671 100644
--- 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)