diff options
| author | Mark Brown | 2012-07-05 21:35:31 +0200 |
|---|---|---|
| committer | Samuel Ortiz | 2012-07-09 00:39:07 +0200 |
| commit | 863df8d5f1a1a92016e24c80947cb3509b8aaa48 (patch) | |
| tree | 77770052c0e5fb149e45d2c3e080011db1fa9ad1 /drivers/mfd/arizona-core.c | |
| parent | mfd: Treat arizona register read errors as non-fatal during resume (diff) | |
| download | kernel-qcow2-linux-863df8d5f1a1a92016e24c80947cb3509b8aaa48.tar.gz kernel-qcow2-linux-863df8d5f1a1a92016e24c80947cb3509b8aaa48.tar.xz kernel-qcow2-linux-863df8d5f1a1a92016e24c80947cb3509b8aaa48.zip | |
mfd: Add missing WM5102 ifdefs
References to the WM5102 tables need to be guarded.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 03aef6750a9d..7f837edfbfb7 100644 --- a/drivers/mfd/arizona-core.c +++ b/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; |