Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[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 d435594df7869dc5c660c17bde7d46082c91b587..88026d83cc937de09c9c91ca1f6c8e2a40b013df 100644 (file)
--- a/include/asm-sparc64/timer.h
+++ b/include/asm-sparc64/timer.h
@@ -1,32 +1 @@
-/* $Id: timer.h,v 1.3 2000/05/09 17:40:15 davem Exp $
- * timer.h: System timer definitions for sun5.
- *
- * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
- */
-
-#ifndef _SPARC64_TIMER_H
-#define _SPARC64_TIMER_H
-
-#include <linux/types.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);
-       unsigned long softint_mask;
-};
-
-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);
-
-#endif /* _SPARC64_TIMER_H */
+#include <asm-sparc/timer.h>