fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / mc146818rtc.h

diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index cde7dba..432b2fa 100644 (file)
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -13,10 +13,12 @@
 
 #include <asm/io.h>
 #include <linux/rtc.h>                 /* get the user-level API */
-#include <linux/spinlock.h>            /* spinlock_t */
 #include <asm/mc146818rtc.h>           /* register access macros */
 
+#ifdef __KERNEL__
+#include <linux/spinlock.h>            /* spinlock_t */
 extern spinlock_t rtc_lock;            /* serialize CMOS RAM access */
+#endif
 
 /**********************************************************************
  * register summary
@@ -87,4 +89,11 @@ extern spinlock_t rtc_lock;          /* serialize CMOS RAM access */
 # define RTC_VRT 0x80          /* valid RAM and time */
 /**********************************************************************/
 
+#ifndef ARCH_RTC_LOCATION      /* Override by <asm/mc146818rtc.h>? */
+
+#define RTC_IO_EXTENT  0x8
+#define RTC_IOMAPPED   1       /* Default to I/O mapping. */
+
+#endif /* ARCH_RTC_LOCATION */
+
 #endif /* _MC146818RTC_H */