diff --git a/[refs] b/[refs]
index f46c457414c8..e9fd1b631b03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00cde6748255a84beecfdea4caeaf7c9cd05a527
+refs/heads/master: 915214853d7681416d6bdd1591787cdbded459e7
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
index 540e4b6c2dee..75cb6b4dc14f 100644
--- a/trunk/arch/sparc64/kernel/time.c
+++ b/trunk/arch/sparc64/kernel/time.c
@@ -780,6 +780,13 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
 	if (!model || !clock_model_matches(model))
 		return -ENODEV;
 
+	/* 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)
+		return -ENODEV;
+
 	size = (op->resource[0].end - op->resource[0].start) + 1;
 	regs = of_ioremap(&op->resource[0], 0, size, "clock");
 	if (!regs)