From d8d73fadfab7a78f604cf3230a88eea2fa0f756c Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 23 Jul 2008 21:30:44 -0700
Subject: [PATCH] --- yaml --- r: 105487 b: refs/heads/master c:
 4cd0c5c40b64ef9fd94fb8382dade2fd28f2b935 h: refs/heads/master i:   105485:
 ebd4f07fc78b97d5cc42c0831aaddcd9d4d45e36   105483:
 7fb5e891c98bc598bac82f2c373b9ed689d86053   105479:
 c8903b35a695b0e8155c26f34f9c21292cf30438   105471:
 dd6076418e8746619181b3b0a87240f37fe8caee v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/rtc/rtc-s3c.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0262bcdf4e90..3d678bf99d58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35d3fdd5f304c06654c940921fc045c60df34693
+refs/heads/master: 4cd0c5c40b64ef9fd94fb8382dade2fd28f2b935
diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c
index fed86e507fdf..b81ba7020d92 100644
--- a/trunk/drivers/rtc/rtc-s3c.c
+++ b/trunk/drivers/rtc/rtc-s3c.c
@@ -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);
 
@@ -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;
@@ -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		= {