summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/timer.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
commitc7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch)
tree3682407a599b8f9f03fc096298134cafba1c9b2f /include/asm-sparc/timer.h
parent1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff)
o Merge with Linux 2.1.116.
o New Newport console code. o New G364 console code.
Diffstat (limited to 'include/asm-sparc/timer.h')
-rw-r--r--include/asm-sparc/timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/timer.h b/include/asm-sparc/timer.h
index 91add4f49..f1b41f7e4 100644
--- a/include/asm-sparc/timer.h
+++ b/include/asm-sparc/timer.h
@@ -1,4 +1,4 @@
-/* $Id: timer.h,v 1.16 1998/01/30 10:59:59 jj Exp $
+/* $Id: timer.h,v 1.17 1998/04/24 12:30:19 davem Exp $
* timer.h: Definitions for the timer chips on the Sparc.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)