---

yaml --- r: 319758 b: refs/heads/master c: 2984fc0 h: refs/heads/master v: v3
git-mirror · Jul 10, 2012 · 320acf6 · 320acf6
1 parent f852a81
commit 320acf6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2985c29c196418b8f666bc9240c922aa56bff599
+refs/heads/master: 2984fc0093268cfffd39725a70078396c5fdef2a
diff --git a/trunk/drivers/mfd/max77686.c b/trunk/drivers/mfd/max77686.c
@@ -34,11 +34,6 @@
 
 #define I2C_ADDR_RTC	(0x0C >> 1)
 
-static struct of_device_id __devinitdata max77686_pmic_dt_match[] = {
-	{.compatible = "maxim,max77686",        .data = 0},
-	{},
-};
-
 static struct mfd_cell max77686_devs[] = {
 	{ .name = "max77686-pmic", },
 	{ .name = "max77686-rtc", },
@@ -50,6 +45,11 @@ static struct regmap_config max77686_regmap_config = {
 };
 
 #ifdef CONFIG_OF
+static struct of_device_id __devinitdata max77686_pmic_dt_match[] = {
+	{.compatible = "maxim,max77686",        .data = 0},
+	{},
+};
+
 static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device
 								  *dev)
 {