---

yaml --- r: 345011 b: refs/heads/master c: 24ae36f h: refs/heads/master i: 345009: 316046a 345007: 7cf3627 v: v3
git-mirror · Nov 21, 2012 · ed78442 · ed78442
1 parent aed60b8
commit ed78442
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7b76dce8ac95fd464bfae741b830d407884c274
+refs/heads/master: 24ae36f5c285d14f449dd19821aca1097a2a2313
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
@@ -646,7 +646,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
 			return PTR_ERR(child);
 	}
 
-	if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc) {
+	if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc &&
+	    twl_class_is_4030()) {
 		child = add_child(2, "twl4030_madc",
 				pdata->madc, sizeof(*pdata->madc),
 				true, irq_base + MADC_INTR_OFFSET, 0);