Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / mips / lasat / setup.c

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index dcd819d57dae4f39688ded7193970f3ed29100c4..bb70a8240e610026dae01c69d4c3b195b9ac4833 100644 (file)
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -134,8 +134,8 @@ void __init serial_init(void)
 
        memset(&s, 0, sizeof(s));
 
-       s.flags = STD_COM_FLAGS;
-       s.iotype = SERIAL_IO_MEM;
+       s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
+       s.iotype = UPIO_MEM;
 
        if (mips_machtype == MACH_LASAT_100) {
                s.uartclk = LASAT_BASE_BAUD_100 * 16;
@@ -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