Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105487
b: refs/heads/master
c: 4cd0c5c
h: refs/heads/master
i:
  105485: ebd4f07
  105483: 7fb5e89
  105479: c8903b3
  105471: dd60764
v: v3
  • Loading branch information
Ben Dooks authored and Linus Torvalds committed Jul 24, 2008
1 parent 14c9084 commit d8d73fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 35d3fdd5f304c06654c940921fc045c60df34693
refs/heads/master: 4cd0c5c40b64ef9fd94fb8382dade2fd28f2b935
6 changes: 3 additions & 3 deletions trunk/drivers/rtc/rtc-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
}
}

static int s3c_rtc_remove(struct platform_device *dev)
static int __devexit s3c_rtc_remove(struct platform_device *dev)
{
struct rtc_device *rtc = platform_get_drvdata(dev);

Expand All @@ -447,7 +447,7 @@ static int s3c_rtc_remove(struct platform_device *dev)
return 0;
}

static int s3c_rtc_probe(struct platform_device *pdev)
static int __devinit s3c_rtc_probe(struct platform_device *pdev)
{
struct rtc_device *rtc;
struct resource *res;
Expand Down Expand Up @@ -560,7 +560,7 @@ static int s3c_rtc_resume(struct platform_device *pdev)

static struct platform_driver s3c2410_rtcdrv = {
.probe = s3c_rtc_probe,
.remove = s3c_rtc_remove,
.remove = __devexit_p(s3c_rtc_remove),
.suspend = s3c_rtc_suspend,
.resume = s3c_rtc_resume,
.driver = {
Expand Down

0 comments on commit d8d73fa

Please sign in to comment.