Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199805
b: refs/heads/master
c: e893de5
h: refs/heads/master
i:
  199803: c3b87f6
v: v3
  • Loading branch information
Maurus Cuelenaere authored and Linus Torvalds committed Jun 4, 2010
1 parent 362ccf1 commit 61fa7a8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b8a3c6091a2337391ed878693604d712d6420241
refs/heads/master: e893de59a4982791368b3ce412bc67dd601a88a0
5 changes: 3 additions & 2 deletions trunk/drivers/rtc/rtc-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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:
Expand Down

0 comments on commit 61fa7a8

Please sign in to comment.