diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/linux/mc146818rtc.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/linux/mc146818rtc.h')
| -rw-r--r-- | include/linux/mc146818rtc.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h index f0f86bca1..cab50dd9e 100644 --- a/include/linux/mc146818rtc.h +++ b/include/linux/mc146818rtc.h @@ -1,6 +1,4 @@ -/* $Id$ - * - * mc146818rtc.h - register definitions for the Real-Time-Clock / CMOS RAM +/* mc146818rtc.h - register definitions for the Real-Time-Clock / CMOS RAM * Copyright Torsten Duwe <duwe@informatik.uni-erlangen.de> 1993 * derived from Data Sheet, Copyright Motorola 1984 (!). * It was written to be part of the Linux operating system. @@ -9,10 +7,13 @@ * in terms of the GNU Library General Public License, Version 2 or later, * at your option. */ -#ifndef _LINUX_MC146818RTC_H -#define _LINUX_MC146818RTC_H -#include <asm/mc146818rtc.h> +#ifndef _MC146818RTC_H +#define _MC146818RTC_H + +#include <asm/io.h> +#include <linux/rtc.h> /* get the user-level API */ +#include <asm/mc146818rtc.h> /* register access macros */ /********************************************************************** * register summary @@ -94,4 +95,4 @@ #define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10) #endif -#endif /* _LINUX_MC146818RTC_H */ +#endif /* _MC146818RTC_H */ |