3.11.10.6 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Ankur Raina <Ankur.Raina@xxxxxxxxxxxxxxx> commit 1d057b853962a84a2c41a0a0a7fc15a631ac96e8 upstream. DA9055 is a combination of pmic and codec. This patch updates the DA9055 i2c device id name to match the standard naming convention followed for such chips. Signed-off-by: Ankur Raina <Ankur.Raina@xxxxxxxxxxxxxxx> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx> --- drivers/mfd/da9055-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c index 607387f..13af7e5 100644 --- a/drivers/mfd/da9055-i2c.c +++ b/drivers/mfd/da9055-i2c.c @@ -54,7 +54,7 @@ static int da9055_i2c_remove(struct i2c_client *i2c) } static struct i2c_device_id da9055_i2c_id[] = { - {"da9055-pmic", 0}, + {"da9055", 0}, { } }; -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html