The patch titled
char-rtc-handle-memory-mapped-chips-properly cleanup
has been removed from the -mm tree. Its filename is
char-rtc-handle-memory-mapped-chips-properly-cleanup.patch
This patch was dropped because it was folded into char-rtc-handle-memory-mapped-chips-properly.patch
------------------------------------------------------
Subject: char-rtc-handle-memory-mapped-chips-properly cleanup
From: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
Cc: Martin Michlmayr <tbm@xxxxxxxxxx>
Cc: Paul Gortmaker <penguin@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-mips/mach-dec/mc146818rtc.h | 2 ++
include/linux/mc146818rtc.h | 9 ++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff -puN include/asm-mips/mach-dec/mc146818rtc.h~char-rtc-handle-memory-mapped-chips-properly-cleanup include/asm-mips/mach-dec/mc146818rtc.h
--- a/include/asm-mips/mach-dec/mc146818rtc.h~char-rtc-handle-memory-mapped-chips-properly-cleanup
+++ a/include/asm-mips/mach-dec/mc146818rtc.h
@@ -19,6 +19,8 @@
extern volatile u8 *dec_rtc_base;
+#define ARCH_RTC_LOCATION
+
#define RTC_PORT(x) CPHYSADDR((long)dec_rtc_base)
#define RTC_IO_EXTENT dec_kn_slot_size
#define RTC_IOMAPPED 0
diff -puN include/linux/mc146818rtc.h~char-rtc-handle-memory-mapped-chips-properly-cleanup include/linux/mc146818rtc.h
--- a/include/linux/mc146818rtc.h~char-rtc-handle-memory-mapped-chips-properly-cleanup
+++ a/include/linux/mc146818rtc.h
@@ -89,12 +89,11 @@ extern spinlock_t rtc_lock; /* serializ
# define RTC_VRT 0x80 /* valid RAM and time */
/**********************************************************************/
-#ifndef RTC_IO_EXTENT
-#define RTC_IO_EXTENT 0x8
-#endif
+#ifndef ARCH_RTC_LOCATION /* Override by <asm/mc146818rtc.h>? */
-#ifndef RTC_IOMAPPED
+#define RTC_IO_EXTENT 0x8
#define RTC_IOMAPPED 1 /* Default to I/O mapping. */
-#endif
+
+#endif /* ARCH_RTC_LOCATION */
#endif /* _MC146818RTC_H */
_
Patches currently in -mm which might be from ralf@xxxxxxxxxxxxxx are
origin.patch
char-rtc-handle-memory-mapped-chips-properly.patch
char-rtc-handle-memory-mapped-chips-properly-cleanup.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
