aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/rtc.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2008-06-04 04:26:59 -0400
committerJiri Kosina <jkosina@suse.cz>2008-06-04 04:26:59 -0400
commitf38bb7de289f5c15e287386d35e9c325f1062c49 (patch)
tree38e69a9ecea18243e3f66bcf51bc89cd7b8f0c94 /include/asm-sparc64/rtc.h
parent2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (diff)
parentc3b25b32e8bef526cca748e1ba023c6bdd705a99 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc64/rtc.h')
-rw-r--r--include/asm-sparc64/rtc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h
index cb17334595c9..f9ecb1fe2ecd 100644
--- a/include/asm-sparc64/rtc.h
+++ b/include/asm-sparc64/rtc.h
@@ -1,5 +1,4 @@
1/* $Id: rtc.h,v 1.1 1996/12/26 14:22:35 davem Exp $ 1/*
2 *
3 * rtc.h: Definitions for access to the Mostek real time clock 2 * rtc.h: Definitions for access to the Mostek real time clock
4 * 3 *
5 * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) 4 * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)