Merge ../linux-2.6

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 83eb08b7a072..bb70a8240e61 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -165,7 +165,8 @@ void __init plat_setup(void)
 
         /* Set up panic notifier */
         for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++)
-                notifier_chain_register(&panic_notifier_list, &lasat_panic_block[i]);
+                atomic_notifier_chain_register(&panic_notifier_list,
+                                &lasat_panic_block[i]);
 
         lasat_reboot_setup();
 
@@ -174,8 +175,8 @@ void __init plat_setup(void)
 
 #ifdef CONFIG_DS1603
         ds1603 = &ds_defs[mips_machtype];
-        rtc_get_time = ds1603_read;
-        rtc_set_time = ds1603_set;
+        rtc_mips_get_time = ds1603_read;
+        rtc_mips_set_time = ds1603_set;
 #endif
 
 #ifdef DYNAMIC_SERIAL_INIT