Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulato...

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

diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index 580b3f4956ee260b551850d157f1f1b3992a5429..433e0c74d643fecb192e777aaeee485c65a1da0d 100644 (file)
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -31,6 +31,10 @@ struct cmos_rtc_board_info {
        void    (*wake_on)(struct device *dev);
        void    (*wake_off)(struct device *dev);
 
+       u32     flags;
+#define CMOS_RTC_FLAGS_NOFREQ  (1 << 0)
+       int     address_space;
+
        u8      rtc_day_alarm;          /* zero, or register index */
        u8      rtc_mon_alarm;          /* zero, or register index */
        u8      rtc_century;            /* zero, or register index */
@@ -109,8 +113,11 @@ struct cmos_rtc_board_info {
 #ifndef ARCH_RTC_LOCATION      /* Override by <asm/mc146818rtc.h>? */
 
 #define RTC_IO_EXTENT  0x8
+#define RTC_IO_EXTENT_USED     0x2
 #define RTC_IOMAPPED   1       /* Default to I/O mapping. */
 
+#else
+#define RTC_IO_EXTENT_USED      RTC_IO_EXTENT
 #endif /* ARCH_RTC_LOCATION */
 
 #endif /* _MC146818RTC_H */