summaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/time.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-04-03 00:22:11 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-03 00:22:11 +0200
commitcd02938a828f4b2098a074afb7454f106f2e8df5 (patch)
tree7b543fd6aa82a62dc3a9614c26f89daca83e77d5 /arch/parisc/kernel/time.c
parent[ARM] 5444/1: ARM: Realview: Fix event-device multiplicators in localtimer.c (diff)
parentARM: Add SMSC911X support to Overo platform (V2) (diff)
downloadlinux-cd02938a828f4b2098a074afb7454f106f2e8df5.tar.xz
linux-cd02938a828f4b2098a074afb7454f106f2e8df5.zip
Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6
Diffstat (limited to 'arch/parisc/kernel/time.c')
-rw-r--r--arch/parisc/kernel/time.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 9d46c43a4152..e75cae6072c5 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -216,17 +216,14 @@ void __init start_cpu_itimer(void)
per_cpu(cpu_data, cpu).it_value = next_tick;
}
-struct platform_device rtc_parisc_dev = {
+static 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)
+ if (platform_device_register(&rtc_parisc_dev) < 0)
printk(KERN_ERR "unable to register rtc device...\n");
/* not necessarily an error */