diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /include/asm-sparc/rtc.h | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/rtc.h')
| -rw-r--r-- | include/asm-sparc/rtc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sparc/rtc.h b/include/asm-sparc/rtc.h index f4f261dde699..f9ecb1fe2ecd 100644 --- a/include/asm-sparc/rtc.h +++ b/include/asm-sparc/rtc.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* $Id: rtc.h,v 1.2 1996/08/21 23:17:39 ecd 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) |