diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /arch/mips/sgi/kernel | |
parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) |
Merge with Linux 2.4.0.
Diffstat (limited to 'arch/mips/sgi/kernel')
-rw-r--r-- | arch/mips/sgi/kernel/indy_rtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi/kernel/indy_rtc.c b/arch/mips/sgi/kernel/indy_rtc.c index bad4f6667..b53ca3b5a 100644 --- a/arch/mips/sgi/kernel/indy_rtc.c +++ b/arch/mips/sgi/kernel/indy_rtc.c @@ -1,13 +1,13 @@ -/* $Id: indy_rtc.c,v 1.1 1998/06/30 00:21:58 ralf Exp $ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. * * RTC routines for Indy style attached Dallas chip. * - * Copyright (C) 1998 by Ralf Baechle + * Copyright (C) 1998, 2001 by Ralf Baechle */ +#include <linux/spinlock.h> #include <linux/mc146818rtc.h> #include <asm/sgi/sgihpc.h> |