From cb56355dfad1ee0b22727955a326fc1e87f9293e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 29 Jun 2006 14:43:37 -0700
Subject: [PATCH] --- yaml --- r: 31306 b: refs/heads/master c:
 c3a8b85f5ac2c21f4ef75e87bfe55ee7a753ffcf h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/time.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e9fd1b631b03..85ca8daf284f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 915214853d7681416d6bdd1591787cdbded459e7
+refs/heads/master: c3a8b85f5ac2c21f4ef75e87bfe55ee7a753ffcf
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
index 75cb6b4dc14f..e3132b467681 100644
--- a/trunk/arch/sparc64/kernel/time.c
+++ b/trunk/arch/sparc64/kernel/time.c
@@ -783,8 +783,8 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
 	/* On an Enterprise system there can be multiple mostek clocks.
 	 * We should only match the one that is on the central FHC bus.
 	 */
-	if (!strcmp(dp->parent, "fhc") &&
-	    strcmp(dp->parent->parent, "central") != 0)
+	if (!strcmp(dp->parent->name, "fhc") &&
+	    strcmp(dp->parent->parent->name, "central") != 0)
 		return -ENODEV;
 
 	size = (op->resource[0].end - op->resource[0].start) + 1;