From 28f5d89be67a8f40f293d64a9d8b6f127f652949 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Thu, 29 Jan 2009 15:38:57 +1000
Subject: [PATCH] --- yaml --- r: 139957 b: refs/heads/master c:
 bf08d5251840ee7fe7ac561fc65aeead4f31335b h: refs/heads/master i:   139955:
 114e47f135e3940ec21840d1af18dcb167154542 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/m68k/include/asm/mc146818rtc.h    | 31 ++++++++++++++++----
 trunk/arch/m68k/include/asm/mc146818rtc_mm.h | 26 ----------------
 trunk/arch/m68k/include/asm/mc146818rtc_no.h |  9 ------
 4 files changed, 27 insertions(+), 41 deletions(-)
 delete mode 100644 trunk/arch/m68k/include/asm/mc146818rtc_mm.h
 delete mode 100644 trunk/arch/m68k/include/asm/mc146818rtc_no.h

diff --git a/[refs] b/[refs]
index 867a098e6925..31e621fe1056 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4048a211513c3d6c56ddf2efb276113eae0b80
+refs/heads/master: bf08d5251840ee7fe7ac561fc65aeead4f31335b
diff --git a/trunk/arch/m68k/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc.h
index fb90dcf78426..9f70a01f73dc 100644
--- a/trunk/arch/m68k/include/asm/mc146818rtc.h
+++ b/trunk/arch/m68k/include/asm/mc146818rtc.h
@@ -1,5 +1,26 @@
-#ifdef __uClinux__
-#include "mc146818rtc_no.h"
-#else
-#include "mc146818rtc_mm.h"
-#endif
+/*
+ * Machine dependent access functions for RTC registers.
+ */
+#ifndef _ASM_MC146818RTC_H
+#define _ASM_MC146818RTC_H
+
+
+#ifdef CONFIG_ATARI
+/* RTC in Atari machines */
+
+#include <asm/atarihw.h>
+
+#define RTC_PORT(x)	(TT_RTC_BAS + 2*(x))
+#define RTC_ALWAYS_BCD	0
+
+#define CMOS_READ(addr) ({ \
+atari_outb_p((addr),RTC_PORT(0)); \
+atari_inb_p(RTC_PORT(1)); \
+})
+#define CMOS_WRITE(val, addr) ({ \
+atari_outb_p((addr),RTC_PORT(0)); \
+atari_outb_p((val),RTC_PORT(1)); \
+})
+#endif /* CONFIG_ATARI */
+
+#endif /* _ASM_MC146818RTC_H */
diff --git a/trunk/arch/m68k/include/asm/mc146818rtc_mm.h b/trunk/arch/m68k/include/asm/mc146818rtc_mm.h
deleted file mode 100644
index 9f70a01f73dc..000000000000
--- a/trunk/arch/m68k/include/asm/mc146818rtc_mm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#ifdef CONFIG_ATARI
-/* RTC in Atari machines */
-
-#include <asm/atarihw.h>
-
-#define RTC_PORT(x)	(TT_RTC_BAS + 2*(x))
-#define RTC_ALWAYS_BCD	0
-
-#define CMOS_READ(addr) ({ \
-atari_outb_p((addr),RTC_PORT(0)); \
-atari_inb_p(RTC_PORT(1)); \
-})
-#define CMOS_WRITE(val, addr) ({ \
-atari_outb_p((addr),RTC_PORT(0)); \
-atari_outb_p((val),RTC_PORT(1)); \
-})
-#endif /* CONFIG_ATARI */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/trunk/arch/m68k/include/asm/mc146818rtc_no.h b/trunk/arch/m68k/include/asm/mc146818rtc_no.h
deleted file mode 100644
index 907a0481a140..000000000000
--- a/trunk/arch/m68k/include/asm/mc146818rtc_no.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _M68KNOMMU_MC146818RTC_H
-#define _M68KNOMMU_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _M68KNOMMU_MC146818RTC_H */