summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-proc.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-12-13 11:35:08 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 20:05:52 +0300
commita2db8dfce8d94fecae50128d912fec7980687a51 (patch)
tree0670b0d16e3282967dabb073cad6a7e3342812f5 /drivers/rtc/rtc-proc.c
parent5a6534e4cf53e16a6ea92f033f89d6575b3d7422 (diff)
downloadlinux-a2db8dfce8d94fecae50128d912fec7980687a51.tar.xz
[PATCH] rtc framewok: rtc_wkalrm.enabled reporting updates
Fix a glitch in the procfs dumping of whether the alarm IRQ is enabled: use the traditional name (from drivers/char/rtc.c and many other places) of "alarm_IRQ", not "alrm_wakeup" (which didn't even match the efirtc code, which originated that reporting API). Also, update a few of the RTC drivers to stop providing that duplicate status, and/or to expose it properly when reporting the alarm state. We really don't want every RTC driver doing their own thing here... Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/rtc/rtc-proc.c')
-rw-r--r--drivers/rtc/rtc-proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 91a43c970b21..c272afd62173 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -65,7 +65,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
seq_printf(seq, "%02d\n", alrm.time.tm_mday);
else
seq_printf(seq, "**\n");
- seq_printf(seq, "alrm_wakeup\t: %s\n",
+ seq_printf(seq, "alarm_IRQ\t: %s\n",
alrm.enabled ? "yes" : "no");
seq_printf(seq, "alrm_pending\t: %s\n",
alrm.pending ? "yes" : "no");