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

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index b6d35f50e404..23e10b6263d6 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -797,17 +797,15 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                 goto cleanup2;
         }
 
-        pr_info("%s: alarms up to one %s%s, %zd bytes nvram%s\n",
-                        dev_name(&cmos_rtc.rtc->dev),
-                        is_valid_irq(rtc_irq)
-                                ?  (cmos_rtc.mon_alrm
-                                        ? "year"
-                                        : (cmos_rtc.day_alrm
-                                                ? "month" : "day"))
-                                : "no",
-                        cmos_rtc.century ? ", y3k" : "",
-                        nvram.size,
-                        is_hpet_enabled() ? ", hpet irqs" : "");
+        pr_info("%s: %s%s, %zd bytes nvram%s\n",
+                dev_name(&cmos_rtc.rtc->dev),
+                !is_valid_irq(rtc_irq) ? "no alarms" :
+                        cmos_rtc.mon_alrm ? "alarms up to one year" :
+                        cmos_rtc.day_alrm ? "alarms up to one month" :
+                        "alarms up to one day",
+                cmos_rtc.century ? ", y3k" : "",
+                nvram.size,
+                is_hpet_enabled() ? ", hpet irqs" : "");
 
         return 0;