Skip to content

L
linux-davinci
Commit 0fb08171 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files
Options

Merge commit 'sparc-current/master'

parents 00321378 25712efa
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
arch/sparc/kernel/time_32.c
View file @ 0fb08171
...@@ -156,6 +156,10 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id ...@@ -156,6 +156,10 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
if (!model) if (!model)
return -ENODEV; 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]; m48t59_rtc.resource = &op->resource[0];
if (!strcmp(model, "mk48t02")) { if (!strcmp(model, "mk48t02")) {
/* Map the clock register io area read-only */ /* Map the clock register io area read-only */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment