From 727237d9e3d50c192b1d562891204f376acfad83 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 23 Feb 2010 23:38:28 -0800
Subject: [PATCH] --- yaml --- r: 185676 b: refs/heads/master c:
 308f100f2ef8e8b9f65b0f3c2a1c7044ec0e65a5 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/regulator/max8660.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f8de76ca2e5a..096533334acc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd88c9b285b76f329243d5c80960c23a04004043
+refs/heads/master: 308f100f2ef8e8b9f65b0f3c2a1c7044ec0e65a5
diff --git a/trunk/drivers/regulator/max8660.c b/trunk/drivers/regulator/max8660.c
index acc2fb7b6087..f12f1bb62138 100644
--- a/trunk/drivers/regulator/max8660.c
+++ b/trunk/drivers/regulator/max8660.c
@@ -345,8 +345,8 @@ static struct regulator_desc max8660_reg[] = {
 	},
 };
 
-static int max8660_probe(struct i2c_client *client,
-			      const struct i2c_device_id *i2c_id)
+static int __devinit max8660_probe(struct i2c_client *client,
+				   const struct i2c_device_id *i2c_id)
 {
 	struct regulator_dev **rdev;
 	struct max8660_platform_data *pdata = client->dev.platform_data;
@@ -354,7 +354,7 @@ static int max8660_probe(struct i2c_client *client,
 	int boot_on, i, id, ret = -EINVAL;
 
 	if (pdata->num_subdevs > MAX8660_V_END) {
-		dev_err(&client->dev, "Too much regulators found!\n");
+		dev_err(&client->dev, "Too many regulators found!\n");
 		goto out;
 	}
 
@@ -462,7 +462,7 @@ static int max8660_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int max8660_remove(struct i2c_client *client)
+static int __devexit max8660_remove(struct i2c_client *client)
 {
 	struct regulator_dev **rdev = i2c_get_clientdata(client);
 	int i;
@@ -485,9 +485,10 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
 
 static struct i2c_driver max8660_driver = {
 	.probe = max8660_probe,
-	.remove = max8660_remove,
+	.remove = __devexit_p(max8660_remove),
 	.driver		= {
 		.name	= "max8660",
+		.owner	= THIS_MODULE,
 	},
 	.id_table	= max8660_id,
 };