Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / drivers / regulator / max8952.c

diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 486ed8141fcddc93dc13b7c5f91a58e8fd8baf10..3883d85c5b8864835c41b2b5b74b919696bd02d8 100644 (file)
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -26,7 +26,6 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/max8952.h>
-#include <linux/mutex.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/slab.h>
@@ -47,7 +46,6 @@ enum {
 struct max8952_data {
        struct i2c_client       *client;
        struct device           *dev;
-       struct mutex            mutex;
        struct max8952_platform_data *pdata;
        struct regulator_dev    *rdev;
 
@@ -208,7 +206,6 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
        max8952->client = client;
        max8952->dev = &client->dev;
        max8952->pdata = pdata;
-       mutex_init(&max8952->mutex);
 
        max8952->rdev = regulator_register(&regulator, max8952->dev,
                        &pdata->reg_data, max8952);