4 files changed, 8 insertions, 8 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 3bbc74437d52..9038f39d9d73 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -13,7 +13,7 @@ config PARISC
         select HAVE_FUNCTION_GRAPH_TRACER if 64BIT
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT
         select RTC_CLASS
-        select RTC_DRV_PARISC
+        select RTC_DRV_GENERIC
         select INIT_ALL_POSSIBLE
         select BUG
         help
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h
index f3d2090a18dc..fae03e136fa8 100644
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
@@ -187,6 +187,9 @@ static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
         return !rw->counter;
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 029831dfce36..6f69101f90bb 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -254,7 +254,7 @@ sys_vfork(struct pt_regs *regs)
 }
 
 int
-copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+copy_thread(unsigned long clone_flags, unsigned long usp,
             unsigned long unused,       /* in ia64 this is "user_stack_size" */
             struct task_struct * p, struct pt_regs * pregs)
 {
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index badaad9ff139..d4dd05674c62 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -217,17 +217,14 @@ void __init start_cpu_itimer(void)
         per_cpu(cpu_data, cpu).it_value = next_tick;
 }
 
-struct platform_device rtc_parisc_dev = {
-        .name = "rtc-parisc",
+static struct platform_device rtc_generic_dev = {
+        .name = "rtc-generic",
         .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_generic_dev) < 0)
                 printk(KERN_ERR "unable to register rtc device...\n");
 
         /* not necessarily an error */