From fa83bf9e6aa9b317f65c0ba136f897b9b4b81eb5 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 23 Apr 2012 10:02:42 -0300
Subject: [PATCH] --- yaml --- r: 306267 b: refs/heads/master c:
 b151d9a231f18e329a5d0619c1c11117295ce031 h: refs/heads/master i:   306265:
 6f43b6c27c5337b9033c7d78c92693cbbb942e3c   306263:
 3ed3bd7fab68029514c11cdb60f6117143f0a1d0 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/as3645a.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 433cbc6af13b..20fa20e7453f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31ed29f9812a9cb9a1c6d270ff4e19da60046da1
+refs/heads/master: b151d9a231f18e329a5d0619c1c11117295ce031
diff --git a/trunk/drivers/media/video/as3645a.c b/trunk/drivers/media/video/as3645a.c
index 7a3371f044fc..c4b03572dce8 100644
--- a/trunk/drivers/media/video/as3645a.c
+++ b/trunk/drivers/media/video/as3645a.c
@@ -713,7 +713,7 @@ static int as3645a_resume(struct device *dev)
  * The number of LEDs reported in platform data is used to compute default
  * limits. Parameters passed through platform data can override those limits.
  */
-static int as3645a_init_controls(struct as3645a *flash)
+static int __devinit as3645a_init_controls(struct as3645a *flash)
 {
 	const struct as3645a_platform_data *pdata = flash->pdata;
 	struct v4l2_ctrl *ctrl;
@@ -804,8 +804,8 @@ static int as3645a_init_controls(struct as3645a *flash)
 	return flash->ctrls.error;
 }
 
-static int as3645a_probe(struct i2c_client *client,
-			 const struct i2c_device_id *devid)
+static int __devinit as3645a_probe(struct i2c_client *client,
+				   const struct i2c_device_id *devid)
 {
 	struct as3645a *flash;
 	int ret;
@@ -846,7 +846,7 @@ static int as3645a_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int __exit as3645a_remove(struct i2c_client *client)
+static int __devexit as3645a_remove(struct i2c_client *client)
 {
 	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
 	struct as3645a *flash = to_as3645a(subdev);
@@ -877,7 +877,7 @@ static struct i2c_driver as3645a_i2c_driver = {
 		.pm   = &as3645a_pm_ops,
 	},
 	.probe	= as3645a_probe,
-	.remove	= __exit_p(as3645a_remove),
+	.remove	= __devexit_p(as3645a_remove),
 	.id_table = as3645a_id_table,
 };