patch-2.4.20 linux-2.4.20/include/asm-mips64/mc146818rtc.h

Next file: linux-2.4.20/include/asm-mips64/mips-boards/atlas.h
Previous file: linux-2.4.20/include/asm-mips64/linux_logo.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/include/asm-mips64/mc146818rtc.h linux-2.4.20/include/asm-mips64/mc146818rtc.h
@@ -12,9 +12,19 @@
 
 #include <asm/io.h>
 
-#ifndef RTC_PORT
-#define RTC_PORT(x)	(0x70 + (x))
-#endif
+
+/*
+ * This structure defines how to access various features of
+ * different machine types and how to access them.
+ */
+struct rtc_ops {
+	/* How to access the RTC register in a DS1287.  */
+	unsigned char (*rtc_read_data)(unsigned long addr);
+	void (*rtc_write_data)(unsigned char data, unsigned long addr);
+	int (*rtc_bcd_mode)(void);
+};
+
+extern struct rtc_ops *rtc_ops;
 
 /*
  * The yet supported machines all access the RTC index register via
@@ -29,19 +39,8 @@
 #define RTC_ALWAYS_BCD \
 rtc_ops->rtc_bcd_mode()
 
-/*
- * This structure defines how to access various features of
- * different machine types and how to access them.
- */
-struct rtc_ops {
-	/* How to access the RTC register in a DS1287.  */
-	unsigned char (*rtc_read_data)(unsigned long addr);
-	void (*rtc_write_data)(unsigned char data, unsigned long addr);
-	int (*rtc_bcd_mode)(void);
-};
 
-extern struct rtc_ops *rtc_ops;
-
-#define RTC_IRQ 8
+#define RTC_PORT(x)	(0x70 + (x))
+#define RTC_IRQ		8
 
 #endif /* _ASM_MC146818RTC_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)