forked from luck/tmp_suning_uos_patched
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
This commit is contained in:
commit
73939bb56a
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue
Block a user