diff --git a/[refs] b/[refs]
index 95bb10f4392a..621d71e53a01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c277b60a08fe9e201656528b3f5cd35b554e24af
+refs/heads/master: 527aebf29c64a56557f9b44d2852ccb99f91ac3e
diff --git a/trunk/drivers/media/video/adv7180.c b/trunk/drivers/media/video/adv7180.c
index 8b199a86a3a9..77eada64cf74 100644
--- a/trunk/drivers/media/video/adv7180.c
+++ b/trunk/drivers/media/video/adv7180.c
@@ -229,7 +229,7 @@ static const struct v4l2_subdev_ops adv7180_ops = {
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static int adv7180_probe(struct i2c_client *client,
+static __devinit int adv7180_probe(struct i2c_client *client,
 			const struct i2c_device_id *id)
 {
 	struct adv7180_state *state;
@@ -267,7 +267,7 @@ static int adv7180_probe(struct i2c_client *client,
 	return 0;
 }
 
-static int adv7180_remove(struct i2c_client *client)
+static __devexit int adv7180_remove(struct i2c_client *client)
 {
 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
 
@@ -289,7 +289,7 @@ static struct i2c_driver adv7180_driver = {
 		.name	= DRIVER_NAME,
 	},
 	.probe		= adv7180_probe,
-	.remove		= adv7180_remove,
+	.remove		= __devexit_p(adv7180_remove),
 	.id_table	= adv7180_id,
 };