From 3bb2bf1af810f6d23f47347bc943e8db8e743156 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sat, 17 Mar 2012 16:01:09 -0700 Subject: [PATCH] --- yaml --- r: 296885 b: refs/heads/master c: bcc2d6d6fcbee3c07515837b522f6c242f3f99e4 h: refs/heads/master i: 296883: aa41f0177c6163742995a5edd5f9f58e0935f225 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/da9052-i2c.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f876279165a8..1357902e2540 100644 --- 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 index fdc2c6a74e62..36b88e395499 100644 --- 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",