From ed784427713d4c3f638d4dedd08cc206d01f5f8e Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Tue, 13 Nov 2012 09:28:42 +0100
Subject: [PATCH] --- yaml --- r: 345011 b: refs/heads/master c:
 24ae36f5c285d14f449dd19821aca1097a2a2313 h: refs/heads/master i:   345009:
 316046a24a23f01bc1ea2557c30b08596a2d4895   345007:
 7cf362760dc45ba26e55214690a3cc0021085071 v: v3

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

diff --git a/[refs] b/[refs]
index be1a115edb90..2b82a9ce3ad6 100644
--- 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
index 4ae642320205..262466837689 100644
--- 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);