Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index d51d8f20e634..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");
@@ -120,7 +120,7 @@ static int rtc_proc_add_device(struct class_device *class_dev,
                         ent->owner = rtc->owner;
                         ent->data = class_dev;
 
-                        dev_info(class_dev->dev, "rtc intf: proc\n");
+                        dev_dbg(class_dev->dev, "rtc intf: proc\n");
                 }
                 else
                         rtc_dev = NULL;