summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 17:47:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 17:47:38 -0700
commit73939bb56acef1c9e776a10f0aeea0456d6815f6 (patch)
tree89fbcd7fb613674587fcd5f2f0182aefe742e4cd
parent7c8d891c2c7714965db1685289787b0c526f9c42 (diff)
parent1c833bc3b60744a385ac66cc1bc72fbecd5670ab (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32: Fix multiple RTC detections on SUN4D
-rw-r--r--arch/sparc/kernel/time_32.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index 8237dd4dfeb4..4e236391b635 100644
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -145,6 +145,10 @@ static int __devinit clock_probe(struct platform_device *op)
if (!model)
return -ENODEV;
+ /* Only the primary RTC has an address property */
+ if (!of_find_property(dp, "address", NULL))
+ return -ENODEV;
+
m48t59_rtc.resource = &op->resource[0];
if (!strcmp(model, "mk48t02")) {
/* Map the clock register io area read-only */