From 12326fc35fe307cdd2d9a4e1ebf60e9a2af92106 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sat, 23 Feb 2008 15:23:44 -0800 Subject: [PATCH] --- yaml --- r: 86221 b: refs/heads/master c: c8626a1d7250c593f148530b559c20f6f6af18e8 h: refs/heads/master i: 86219: ab58ec0f9b334de538611f8686ccd6d8f9ec60b9 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-cmos.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4f3dac4940d2..2e4e4fc3d75f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4185108c77afee83674101319dc071599846a40b +refs/heads/master: c8626a1d7250c593f148530b559c20f6f6af18e8 diff --git a/trunk/drivers/rtc/rtc-cmos.c b/trunk/drivers/rtc/rtc-cmos.c index e059f94c79eb..f3ee2ad566b4 100644 --- a/trunk/drivers/rtc/rtc-cmos.c +++ b/trunk/drivers/rtc/rtc-cmos.c @@ -388,6 +388,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq) return seq_printf(seq, "periodic_IRQ\t: %s\n" "update_IRQ\t: %s\n" + "HPET_emulated\t: %s\n" // "square_wave\t: %s\n" // "BCD\t\t: %s\n" "DST_enable\t: %s\n" @@ -395,6 +396,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq) "batt_status\t: %s\n", (rtc_control & RTC_PIE) ? "yes" : "no", (rtc_control & RTC_UIE) ? "yes" : "no", + is_hpet_enabled() ? "yes" : "no", // (rtc_control & RTC_SQWE) ? "yes" : "no", // (rtc_control & RTC_DM_BINARY) ? "no" : "yes", (rtc_control & RTC_DST_EN) ? "yes" : "no",