From adeb746e5fc8c19fae6d1f7860090070d56d8464 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 13 Jul 2012 16:24:26 +0000
Subject: [PATCH] --- yaml --- r: 326352 b: refs/heads/master c:
 e27d650b3d39e22df7359dc68401b7dca486fce3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mfd/da9052-i2c.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3be4369156bc..167626c12ffb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a99cc82bd61baefd8bb3110e1284629be3610c0c
+refs/heads/master: e27d650b3d39e22df7359dc68401b7dca486fce3
diff --git a/trunk/drivers/mfd/da9052-i2c.c b/trunk/drivers/mfd/da9052-i2c.c
index 82c9d6450286..352c58b5a90d 100644
--- a/trunk/drivers/mfd/da9052-i2c.c
+++ b/trunk/drivers/mfd/da9052-i2c.c
@@ -46,7 +46,7 @@ static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
 	return 0;
 }
 
-static struct i2c_device_id da9052_i2c_id[] = {
+static const struct i2c_device_id da9052_i2c_id[] = {
 	{"da9052", DA9052},
 	{"da9053-aa", DA9053_AA},
 	{"da9053-ba", DA9053_BA},
@@ -104,7 +104,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
 		const struct of_device_id *deviceid;
 
 		deviceid = of_match_node(dialog_dt_ids, np);
-		id = (const struct i2c_device_id *)deviceid->data;
+		id = deviceid->data;
 	}
 #endif