patch-2.4.0-test2 linux/include/linux/mc146818rtc.h

• Lines: 26
• Date: Fri Jun 23 21:33:14 2000
• Orig file: v2.4.0-test1/linux/include/linux/mc146818rtc.h
• Orig date: Thu Feb 10 17:11:22 2000

diff -u --recursive --new-file v2.4.0-test1/linux/include/linux/mc146818rtc.h linux/include/linux/mc146818rtc.h
@@ -10,22 +10,10 @@
 
 #ifndef _MC146818RTC_H
 #define _MC146818RTC_H
-#include <asm/io.h>
-#include <linux/rtc.h> /* get the user-level API */
-
-#ifndef RTC_PORT
-#define RTC_PORT(x)	(0x70 + (x))
-#define RTC_ALWAYS_BCD	1
-#endif
 
-#define CMOS_READ(addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-inb_p(RTC_PORT(1)); \
-})
-#define CMOS_WRITE(val, addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-outb_p((val),RTC_PORT(1)); \
-})
+#include <asm/io.h>
+#include <linux/rtc.h>			/* get the user-level API */
+#include <asm/mc146818rtc.h>		/* register access macros */
 
 /**********************************************************************
  * register summary