---

yaml --- r: 296885 b: refs/heads/master c: bcc2d6d h: refs/heads/master i: 296883: aa41f01 v: v3
git-mirror · Mar 20, 2012 · 3bb2bf1 · 3bb2bf1
1 parent 76621c7
commit 3bb2bf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5364d0b8640dd15e5c0b3ba40d0e874764b1bc88
+refs/heads/master: bcc2d6d6fcbee3c07515837b522f6c242f3f99e4
diff --git a/trunk/drivers/mfd/da9052-i2c.c b/trunk/drivers/mfd/da9052-i2c.c
@@ -89,7 +89,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int da9052_i2c_remove(struct i2c_client *client)
+static int __devexit da9052_i2c_remove(struct i2c_client *client)
 {
 	struct da9052 *da9052 = i2c_get_clientdata(client);
 
@@ -110,7 +110,7 @@ static struct i2c_device_id da9052_i2c_id[] = {
 
 static struct i2c_driver da9052_i2c_driver = {
 	.probe = da9052_i2c_probe,
-	.remove = da9052_i2c_remove,
+	.remove = __devexit_p(da9052_i2c_remove),
 	.id_table = da9052_i2c_id,
 	.driver = {
 		.name = "da9052",