Merge branch 'master' of /home/sam/kernel/linux-2.6/

[pandora-kernel.git] / arch / mips / lasat / setup.c

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 83eb08b..2187e63 100644 (file)
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -22,7 +22,6 @@
  *
  * Lasat specific setup.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
@@ -155,7 +154,7 @@ void __init serial_init(void)
 }
 #endif
 
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
 {
        int i;
        lasat_misc  = &lasat_misc_info[mips_machtype];
@@ -165,7 +164,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 +174,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