Pull bugzilla-5452 into release branch

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

diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 2c38770b1e1bcf0a5750af1d3dd96604cc7a42bd..a2dd8ae1ea8f10f2f7bf5d7c77055b277b3120bd 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -91,14 +91,14 @@ void __init plat_setup(void)
 {
        board_be_init = ip32_be_init;
 
-       rtc_get_time = mc146818_get_cmos_time;
-       rtc_set_mmss = mc146818_set_rtc_mmss;
+       rtc_mips_get_time = mc146818_get_cmos_time;
+       rtc_mips_set_mmss = mc146818_set_rtc_mmss;
 
        board_time_init = ip32_time_init;
        board_timer_setup = ip32_timer_setup;
 
 #ifdef CONFIG_SERIAL_8250
-       {
+       {
                static struct uart_port o2_serial[2];
 
                memset(o2_serial, 0, sizeof(o2_serial));