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/mips64/lib | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'arch/mips64/lib')
| -rw-r--r-- | arch/mips64/lib/rtc-no.c | 6 | ||||
| -rw-r--r-- | arch/mips64/lib/rtc-std.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips64/lib/rtc-no.c b/arch/mips64/lib/rtc-no.c index 808033648..7a2e4b9e5 100644 --- a/arch/mips64/lib/rtc-no.c +++ b/arch/mips64/lib/rtc-no.c @@ -1,5 +1,4 @@ -/* $Id: rtc-no.c,v 1.1 1999/08/21 21:43:01 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,9 +6,10 @@ * 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/kernel.h> +#include <linux/spinlock.h> #include <linux/mc146818rtc.h> static unsigned char no_rtc_read_data(unsigned long addr) diff --git a/arch/mips64/lib/rtc-std.c b/arch/mips64/lib/rtc-std.c index a4a6ead81..989c0e8cc 100644 --- a/arch/mips64/lib/rtc-std.c +++ b/arch/mips64/lib/rtc-std.c @@ -1,5 +1,4 @@ -/* $Id: rtc-std.c,v 1.1 1999/08/21 21:43:01 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. @@ -8,6 +7,7 @@ * * Copyright (C) 1998 by Ralf Baechle */ +#include <linux/spinlock.h> #include <linux/mc146818rtc.h> #include <asm/io.h> |