From 386642d426d9178c896901ddb3857a4403b797d3 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 26 Dec 2011 15:49:48 +0000
Subject: [PATCH] --- yaml --- r: 280568 b: refs/heads/master c:
 d9cba48358d858a1edea877d7b7b0bce58cee850 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2eb0b94ff1b0..19371f3a8b32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5a26f8915779cf548481d64c7ea1ed5529bdbfe
+refs/heads/master: d9cba48358d858a1edea877d7b7b0bce58cee850
diff --git a/trunk/drivers/mfd/da9052-core.c b/trunk/drivers/mfd/da9052-core.c
index a7c115ca56c8..2a5e27168cac 100644
--- a/trunk/drivers/mfd/da9052-core.c
+++ b/trunk/drivers/mfd/da9052-core.c
@@ -383,7 +383,7 @@ static struct resource da9052_tsi_resources[] = {
 	},
 };
 
-static struct mfd_cell __initdata da9052_subdev_info[] = {
+static struct mfd_cell __devinitdata da9052_subdev_info[] = {
 	{
 		.name = "da9052-regulator",
 		.id = 1,
@@ -637,7 +637,7 @@ struct regmap_config da9052_regmap_config = {
 };
 EXPORT_SYMBOL_GPL(da9052_regmap_config);
 
-int da9052_device_init(struct da9052 *da9052, u8 chip_id)
+int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)
 {
 	struct da9052_pdata *pdata = da9052->dev->platform_data;
 	struct irq_desc *desc;