diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 15:16:15 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 15:16:15 -0500 |
| commit | 35267ab61f0bf7a867ac87e19714b858d08d440a (patch) | |
| tree | db84140a40b22208fe2a598fa233c26e79eb6465 /arch/powerpc/platforms/maple/time.c | |
| parent | a9931a6e37c09f6b76a9fa0cbd777c335548692b (diff) | |
| parent | 8907e94be2661be940c622232d6ce5ae938f10c3 (diff) | |
| download | op-kernel-dev-35267ab61f0bf7a867ac87e19714b858d08d440a.zip op-kernel-dev-35267ab61f0bf7a867ac87e19714b858d08d440a.tar.gz | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/powerpc/platforms/maple/time.c')
| -rw-r--r-- | arch/powerpc/platforms/maple/time.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c index 40fc07a..15846cc 100644 --- a/arch/powerpc/platforms/maple/time.c +++ b/arch/powerpc/platforms/maple/time.c @@ -158,6 +158,11 @@ int maple_set_rtc_time(struct rtc_time *tm) return 0; } +static struct resource rtc_iores = { + .name = "rtc", + .flags = IORESOURCE_BUSY, +}; + unsigned long __init maple_get_boot_time(void) { struct rtc_time tm; @@ -172,7 +177,11 @@ unsigned long __init maple_get_boot_time(void) printk(KERN_INFO "Maple: No device node for RTC, assuming " "legacy address (0x%x)\n", maple_rtc_addr); } - + + rtc_iores.start = maple_rtc_addr; + rtc_iores.end = maple_rtc_addr + 7; + request_resource(&ioport_resource, &rtc_iores); + maple_get_rtc_time(&tm); return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); |
