From edec446ffc7b910e9cdc2c8a9eda10b99649dd2b Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 23 Feb 2010 23:38:23 -0800
Subject: [PATCH] --- yaml --- r: 185675 b: refs/heads/master c:
 bd88c9b285b76f329243d5c80960c23a04004043 h: refs/heads/master i:   185673:
 b426c2a3106c6d39cf935ad6ca40afa9af38b2eb   185671:
 7e1d89c51cec539a83836a00f15a57ffb3cf142e v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/regulator/max1586.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 882fd6164e5f..f8de76ca2e5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebbed04fe7f89c9cb00df32f7123bc1b84b456cb
+refs/heads/master: bd88c9b285b76f329243d5c80960c23a04004043
diff --git a/trunk/drivers/regulator/max1586.c b/trunk/drivers/regulator/max1586.c
index 2c082d3ef484..a49fc952c9a9 100644
--- a/trunk/drivers/regulator/max1586.c
+++ b/trunk/drivers/regulator/max1586.c
@@ -179,8 +179,8 @@ static struct regulator_desc max1586_reg[] = {
 	},
 };
 
-static int max1586_pmic_probe(struct i2c_client *client,
-			      const struct i2c_device_id *i2c_id)
+static int __devinit max1586_pmic_probe(struct i2c_client *client,
+					const struct i2c_device_id *i2c_id)
 {
 	struct regulator_dev **rdev;
 	struct max1586_platform_data *pdata = client->dev.platform_data;
@@ -235,7 +235,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int max1586_pmic_remove(struct i2c_client *client)
+static int __devexit max1586_pmic_remove(struct i2c_client *client)
 {
 	struct regulator_dev **rdev = i2c_get_clientdata(client);
 	int i;
@@ -257,9 +257,10 @@ MODULE_DEVICE_TABLE(i2c, max1586_id);
 
 static struct i2c_driver max1586_pmic_driver = {
 	.probe = max1586_pmic_probe,
-	.remove = max1586_pmic_remove,
+	.remove = __devexit_p(max1586_pmic_remove),
 	.driver		= {
 		.name	= "max1586",
+		.owner	= THIS_MODULE,
 	},
 	.id_table	= max1586_id,
 };