Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / rtc / rtc-ep93xx.c

diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 6d9fe2cca28594160af6d5ce8073e449bb78d3be..e1a1169e46649f4be8c8917f5a1a9b6cc7230615 100644 (file)
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -109,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);
        }