diff --git a/[refs] b/[refs] index 89fabdf5e20f..332b22b5e291 100644 --- 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 index 11e56017e0b0..9e7e1d30f25f 100644 --- a/trunk/drivers/mfd/max77686.c +++ b/trunk/drivers/mfd/max77686.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -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 index 962f65e72b71..d327d4971e4f 100644 --- 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;