Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[pandora-kernel.git] / drivers / rtc / rtc-ep93xx.c

diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 0dd80ea..e1a1169 100644 (file)
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -67,7 +67,6 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
 
        ep93xx_get_swcomp(dev, &preload, &delete);
 
-       seq_printf(seq, "24hr\t\t: yes\n");
        seq_printf(seq, "preload\t\t: %d\n", preload);
        seq_printf(seq, "delete\t\t: %d\n", delete);
 
@@ -110,7 +109,6 @@ static int __devinit ep93xx_rtc_probe(struct platform_device *dev)
                                &dev->dev, &ep93xx_rtc_ops, THIS_MODULE);
 
        if (IS_ERR(rtc)) {
-               dev_err(&dev->dev, "unable to register\n");
                return PTR_ERR(rtc);
        }