Merge branch 'linus' into tracing/sysprof

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / timer.h

diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h
index edc8e08c3a39042b73d9a52b9de7617761a8991f..5b779fd1f78828d123ea047164852b547263eeba 100644 (file)
--- a/include/asm-sparc64/timer.h
+++ b/include/asm-sparc64/timer.h
@@ -1,33 +1,30 @@
-/* $Id: timer.h,v 1.3 2000/05/09 17:40:15 davem Exp $
- * timer.h: System timer definitions for sun5.
+/* timer.h: System timer definitions for sun5.
  *
- * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net)
  */
 
 #ifndef _SPARC64_TIMER_H
 #define _SPARC64_TIMER_H
 
 #include <linux/types.h>
-
-#include <linux/config.h>
+#include <linux/init.h>
 
 struct sparc64_tick_ops {
-       void (*init_tick)(unsigned long);
        unsigned long (*get_tick)(void);
-       unsigned long (*get_compare)(void);
-       unsigned long (*add_tick)(unsigned long, unsigned long);
-       unsigned long (*add_compare)(unsigned long);
+       int (*add_compare)(unsigned long);
        unsigned long softint_mask;
+       void (*disable_irq)(void);
+
+       void (*init_tick)(void);
+       unsigned long (*add_tick)(unsigned long);
+
+       char *name;
 };
 
 extern struct sparc64_tick_ops *tick_ops;
 
-#ifdef CONFIG_SMP
-extern unsigned long timer_tick_offset;
-struct pt_regs;
-extern void timer_tick_interrupt(struct pt_regs *);
-#endif
-
 extern unsigned long sparc64_get_clock_tick(unsigned int cpu);
+extern void __devinit setup_sparc64_timer(void);
+extern void __init time_init(void);
 
 #endif /* _SPARC64_TIMER_H */