diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/parisc/Kconfig | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/time.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index aacf11d33723..378b64944dc0 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -10,7 +10,7 @@ config PARISC | |||
10 | select HAVE_IDE | 10 | select HAVE_IDE |
11 | select HAVE_OPROFILE | 11 | select HAVE_OPROFILE |
12 | select RTC_CLASS | 12 | select RTC_CLASS |
13 | select RTC_DRV_PARISC | 13 | select RTC_DRV_GENERIC |
14 | select INIT_ALL_POSSIBLE | 14 | select INIT_ALL_POSSIBLE |
15 | help | 15 | help |
16 | The PA-RISC microprocessor is designed by Hewlett-Packard and used | 16 | The PA-RISC microprocessor is designed by Hewlett-Packard and used |
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index e75cae6072c5..86a99d02234f 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c | |||
@@ -216,14 +216,14 @@ void __init start_cpu_itimer(void) | |||
216 | per_cpu(cpu_data, cpu).it_value = next_tick; | 216 | per_cpu(cpu_data, cpu).it_value = next_tick; |
217 | } | 217 | } |
218 | 218 | ||
219 | static struct platform_device rtc_parisc_dev = { | 219 | static struct platform_device rtc_generic_dev = { |
220 | .name = "rtc-parisc", | 220 | .name = "rtc-generic", |
221 | .id = -1, | 221 | .id = -1, |
222 | }; | 222 | }; |
223 | 223 | ||
224 | static int __init rtc_init(void) | 224 | static int __init rtc_init(void) |
225 | { | 225 | { |
226 | if (platform_device_register(&rtc_parisc_dev) < 0) | 226 | if (platform_device_register(&rtc_generic_dev) < 0) |
227 | printk(KERN_ERR "unable to register rtc device...\n"); | 227 | printk(KERN_ERR "unable to register rtc device...\n"); |
228 | 228 | ||
229 | /* not necessarily an error */ | 229 | /* not necessarily an error */ |