git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
time_32.c
diff --git
a/arch/sparc/kernel/time_32.c
b/arch/sparc/kernel/time_32.c
index
8237dd4
..
4e23639
100644
(file)
--- 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;
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 */
m48t59_rtc.resource = &op->resource[0];
if (!strcmp(model, "mk48t02")) {
/* Map the clock register io area read-only */