Merge branch 'linus' into core/urgent

[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 4125a5ba119e2fce144708c9b151e03f87d0ef75..c5a5d4a31b4b42f1c7d3c9a2f45cbbe88e16bf01 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -62,11 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 }
 #endif
 
-unsigned long read_persistent_clock(void)
-{
-       return mc146818_get_cmos_time();
-}
-
 /* An arbitrary time; this can be decreased if reliability looks good */
 #define WAIT_MS 10
 
@@ -80,12 +75,6 @@ void __init plat_time_init(void)
        printk("%d MHz CPU detected\n", mips_hpt_frequency * 2 / 1000000);
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
-{
-       irq->handler = no_action;
-       setup_irq(IP32_R4K_TIMER_IRQ, irq);
-}
-
 void __init plat_mem_setup(void)
 {
        board_be_init = ip32_be_init;