diff options
author | Ingo Molnar | 2008-10-24 12:48:46 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-10-24 12:48:46 +0200 |
commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
tree | d535f46a917e14e90deccb29ad00aac016ad18dd /arch/parisc/kernel/time.c | |
parent | sched: add CONFIG_SMP consistency (diff) | |
parent | Linux 2.6.28-rc1 (diff) | |
download | kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.gz kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.xz kernel-qcow2-linux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.zip |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'arch/parisc/kernel/time.c')
-rw-r--r-- | arch/parisc/kernel/time.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 24be86bba94d..4d09203bc693 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -23,6 +23,7 @@ #include <linux/smp.h> #include <linux/profile.h> #include <linux/clocksource.h> +#include <linux/platform_device.h> #include <asm/uaccess.h> #include <asm/io.h> @@ -215,6 +216,24 @@ void __init start_cpu_itimer(void) cpu_data[cpu].it_value = next_tick; } +struct platform_device rtc_parisc_dev = { + .name = "rtc-parisc", + .id = -1, +}; + +static int __init rtc_init(void) +{ + int ret; + + ret = platform_device_register(&rtc_parisc_dev); + if (ret < 0) + printk(KERN_ERR "unable to register rtc device...\n"); + + /* not necessarily an error */ + return 0; +} +module_init(rtc_init); + void __init time_init(void) { static struct pdc_tod tod_data; @@ -245,4 +264,3 @@ void __init time_init(void) xtime.tv_nsec = 0; } } - |