diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:47:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:47:38 -0700 |
| commit | 73939bb56acef1c9e776a10f0aeea0456d6815f6 (patch) | |
| tree | 89fbcd7fb613674587fcd5f2f0182aefe742e4cd /arch/sparc | |
| parent | 7c8d891c2c7714965db1685289787b0c526f9c42 (diff) | |
| parent | 1c833bc3b60744a385ac66cc1bc72fbecd5670ab (diff) | |
| download | talos-obmc-linux-73939bb56acef1c9e776a10f0aeea0456d6815f6.tar.gz talos-obmc-linux-73939bb56acef1c9e776a10f0aeea0456d6815f6.zip | |
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
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/time_32.c | 4 |
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 */ |
