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/lib | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'arch/mips/lib')
| -rw-r--r-- | arch/mips/lib/rtc-no.c | 6 | ||||
| -rw-r--r-- | arch/mips/lib/rtc-std.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/lib/rtc-no.c b/arch/mips/lib/rtc-no.c index 7f0c02e18..4da0e1303 100644 --- a/arch/mips/lib/rtc-no.c +++ b/arch/mips/lib/rtc-no.c @@ -1,5 +1,4 @@ -/* $Id: rtc-no.c,v 1.2 1998/06/25 20:19:15 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. @@ -7,8 +6,9 @@ * Stub RTC routines to keep Linux from crashing on machine which don't * have a RTC chip. * - * Copyright (C) 1998 by Ralf Baechle + * Copyright (C) 1998, 2001 by Ralf Baechle */ +#include <linux/spinlock.h> #include <linux/kernel.h> #include <linux/mc146818rtc.h> diff --git a/arch/mips/lib/rtc-std.c b/arch/mips/lib/rtc-std.c index a601d1879..334ee3884 100644 --- a/arch/mips/lib/rtc-std.c +++ b/arch/mips/lib/rtc-std.c @@ -1,13 +1,13 @@ -/* $Id: rtc-std.c,v 1.2 1998/06/25 20:19:16 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 PC 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/io.h> |