---

yaml --- r: 319725 b: refs/heads/master c: b874809 h: refs/heads/master i: 319723: 94adb80 v: v3
git-mirror · Jul 8, 2012 · 0a623b4 · 0a623b4
1 parent 5d84add
commit 0a623b4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2573f6d36e73e080fc1d9d9ac7dfaf2253a61434
+refs/heads/master: b8748096111b483de8a544cc220510dff17bbff9
diff --git a/trunk/drivers/mfd/max77686.c b/trunk/drivers/mfd/max77686.c
@@ -27,7 +27,6 @@
 #include <linux/i2c.h>
 #include <linux/pm_runtime.h>
 #include <linux/module.h>
-#include <linux/mutex.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/max77686.h>
 #include <linux/mfd/max77686-private.h>
@@ -79,8 +78,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 	max77686->wakeup = pdata->wakeup;
 	max77686->irq_gpio = pdata->irq_gpio;
 
-	mutex_init(&max77686->iolock);
-
 	if (regmap_read(max77686->regmap,
 			 MAX77686_REG_DEVICE_ID, &data) < 0) {
 		dev_err(max77686->dev,

diff --git a/trunk/include/linux/mfd/max77686-private.h b/trunk/include/linux/mfd/max77686-private.h
@@ -219,7 +219,6 @@ struct max77686_dev {
 	struct device *dev;
 	struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */
 	struct i2c_client *rtc; /* slave addr 0x0c */
-	struct mutex iolock;
 
 	int type;