From 08526759aafb8c0159f0e77a32bc42aa2791209a Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 20 Jun 2009 09:18:34 -0300
Subject: [PATCH] --- yaml --- r: 153936 b: refs/heads/master c:
 54bb501c069bbe34cf8becf0a9985fc6873d6b21 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/video/tcm825x.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1669ea5be77e..ce09e64a32ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5543e2b4c495714e5f1b2dbbe250df15239af1cd
+refs/heads/master: 54bb501c069bbe34cf8becf0a9985fc6873d6b21
diff --git a/trunk/drivers/media/video/tcm825x.c b/trunk/drivers/media/video/tcm825x.c
index b30c49248217..b90e9da3167d 100644
--- a/trunk/drivers/media/video/tcm825x.c
+++ b/trunk/drivers/media/video/tcm825x.c
@@ -878,7 +878,7 @@ static int tcm825x_probe(struct i2c_client *client,
 	return rval;
 }
 
-static int __exit tcm825x_remove(struct i2c_client *client)
+static int tcm825x_remove(struct i2c_client *client)
 {
 	struct tcm825x_sensor *sensor = i2c_get_clientdata(client);
 
@@ -902,7 +902,7 @@ static struct i2c_driver tcm825x_i2c_driver = {
 		.name = TCM825X_NAME,
 	},
 	.probe	= tcm825x_probe,
-	.remove	= __exit_p(tcm825x_remove),
+	.remove	= tcm825x_remove,
 	.id_table = tcm825x_id,
 };