From e5137e7aa1b0bd5d07c9712ad8cfe02f9e1af11b Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 5 Jul 2012 20:35:31 +0100
Subject: [PATCH] --- yaml --- r: 319743 b: refs/heads/master c:
 863df8d5f1a1a92016e24c80947cb3509b8aaa48 h: refs/heads/master i:   319741:
 1a5228b835b3a6832bf4ac0fd9d158472c51e2fd   319739:
 41aa420a948f417b4e76760f52b3c111c6088f93   319735:
 5be323521d8a627cb910393c4630c83c57304364   319727:
 202225d725b5360ea5ee0127af555dc3b6f50c43   319711:
 a5aba166ae21fda27cc8eb46e5c4d017f24fb2ce   319679:
 489882208b77a8aaf2dd233f7ae937fe45cbb897   319615:
 e8b10a1c72e977543c873a733a7c2355a0150423   319487:
 d09cb989ffa8800a3477e11992a2dc4609747e6f v: v3

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

diff --git a/[refs] b/[refs]
index 9223c3feb783..7baf12c70681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfe775ce62d83168125299714739aebc1018211e
+refs/heads/master: 863df8d5f1a1a92016e24c80947cb3509b8aaa48
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index 03aef6750a9d..7f837edfbfb7 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -368,6 +368,7 @@ int __devinit arizona_dev_init(struct arizona *arizona)
 	arizona->rev &= ARIZONA_DEVICE_REVISION_MASK;
 
 	switch (reg) {
+#ifdef CONFIG_MFD_WM5102
 	case 0x5102:
 		type_name = "WM5102";
 		if (arizona->type != WM5102) {
@@ -377,7 +378,7 @@ int __devinit arizona_dev_init(struct arizona *arizona)
 		}
 		ret = wm5102_patch(arizona);
 		break;
-
+#endif
 	default:
 		dev_err(arizona->dev, "Unknown device ID %x\n", reg);
 		goto err_reset;
diff --git a/trunk/drivers/mfd/arizona-i2c.c b/trunk/drivers/mfd/arizona-i2c.c
index 75fb110105e1..fe19d11b92f0 100644
--- a/trunk/drivers/mfd/arizona-i2c.c
+++ b/trunk/drivers/mfd/arizona-i2c.c
@@ -30,9 +30,11 @@ static __devinit int arizona_i2c_probe(struct i2c_client *i2c,
 	int ret;
 
 	switch (id->driver_data) {
+#ifdef CONFIG_MFD_WM5102
 	case WM5102:
 		regmap_config = &wm5102_i2c_regmap;
 		break;
+#endif
 	default:
 		dev_err(&i2c->dev, "Unknown device type %ld\n",
 			id->driver_data);
diff --git a/trunk/drivers/mfd/arizona-irq.c b/trunk/drivers/mfd/arizona-irq.c
index 4c7894046a39..17d20c0fba1e 100644
--- a/trunk/drivers/mfd/arizona-irq.c
+++ b/trunk/drivers/mfd/arizona-irq.c
@@ -158,10 +158,12 @@ int arizona_irq_init(struct arizona *arizona)
 	const struct regmap_irq_chip *aod, *irq;
 
 	switch (arizona->type) {
+#ifdef CONFIG_MFD_WM5102
 	case WM5102:
 		aod = &wm5102_aod;
 		irq = &wm5102_irq;
 		break;
+#endif
 	default:
 		BUG_ON("Unknown Arizona class device" == NULL);
 		return -EINVAL;