tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 73939bb5 7c8d891c

+4
unified split
+4
arch/sparc/kernel/time_32.c
··· 145 if (!model) 146 return -ENODEV; 147 148 m48t59_rtc.resource = &op->resource[0]; 149 if (!strcmp(model, "mk48t02")) { 150 /* Map the clock register io area read-only */
··· 145 if (!model) 146 return -ENODEV; 147 148 + /* Only the primary RTC has an address property */ 149 + if (!of_find_property(dp, "address", NULL)) 150 + return -ENODEV; 151 + 152 m48t59_rtc.resource = &op->resource[0]; 153 if (!strcmp(model, "mk48t02")) { 154 /* Map the clock register io area read-only */