From 61fa7a8b619de45c99264f363f0edb77cfb30032 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 4 Jun 2010 14:14:44 -0700 Subject: [PATCH] --- yaml --- r: 199805 b: refs/heads/master c: e893de59a4982791368b3ce412bc67dd601a88a0 h: refs/heads/master i: 199803: c3b87f6416285afbf23a0cd017eab649451efc27 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-s3c.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 501509d0d645..76030bfd6690 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8a3c6091a2337391ed878693604d712d6420241 +refs/heads/master: e893de59a4982791368b3ce412bc67dd601a88a0 diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c index e5972b2c17b7..6adebf31ea69 100644 --- a/trunk/drivers/rtc/rtc-s3c.c +++ b/trunk/drivers/rtc/rtc-s3c.c @@ -495,8 +495,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) pr_debug("s3c2410_rtc: RTCCON=%02x\n", readb(s3c_rtc_base + S3C2410_RTCCON)); - s3c_rtc_setfreq(&pdev->dev, 1); - device_init_wakeup(&pdev->dev, 1); /* register RTC and exit */ @@ -518,6 +516,9 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data; platform_set_drvdata(pdev, rtc); + + s3c_rtc_setfreq(&pdev->dev, 1); + return 0; err_nortc: