Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits)
  Regulators: wm8400 - cleanup platform driver data handling
  Regulators: wm8994 - clean up driver data after removal
  Regulators: wm831x-xxx - clean up driver data after removal
  Regulators: pcap-regulator - clean up driver data after removal
  Regulators: max8660 - annotate probe and remove methods
  Regulators: max1586 - annotate probe and remove methods
  Regulators: lp3971 - fail if platform data was not supplied
  Regulators: tps6507x-regulator - mark probe method as __devinit
  Regulators: tps65023-regulator - mark probe method as __devinit
  Regulators: twl-regulator - mark probe function as __devinit
  Regulators: fixed - annotate probe and remove methods
  Regulators: ab3100 - fix probe and remove annotations
  Regulators: virtual - use sysfs attribute groups
  twl6030: regulator: Configure STATE register instead of REMAP
  regulator: Provide optional dummy regulator for consumers
  regulator: Assume regulators are enabled if they don't report anything
  regulator: Convert fixed voltage regulator to use enable_time()
  regulator: Add WM8994 regulator support
  regulator: enable max8649 regulator driver
  regulator: trivial: fix typos in user-visible Kconfig text
  ...

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index acc2fb7b6087..f12f1bb62138 100644
--- a/drivers/regulator/max8660.c
+++ b/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 @@ out:
         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,
 };