summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/rt5640.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@gmail.com>2013-09-19 11:18:06 +0200
committerMark Brown <broonie@linaro.org>2013-09-19 11:41:03 +0100
commit32fcb97b9f699f63742bcaadca6e0beede86e8e8 (patch)
treef398db1c4680891c8b7b6b8bea372e3623b9f82a /sound/soc/codecs/rt5640.c
parent02b80773de3732dae11c1cf0c1ce40378901bd0e (diff)
ASoC: rt5640: Omit ACPI match table only if !ACPI
The ACPI_PTR() macro evaluates to NULL if ACPI is disabled and hence the ACPI match table won't be used, causing the compiler to complain. Avoid this by protecting the table using an #ifdef CONFIG_ACPI. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/rt5640.c')
-rw-r--r--sound/soc/codecs/rt5640.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 0bfb960e90f8..641eeeb00c5c 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2082,11 +2082,13 @@ static const struct i2c_device_id rt5640_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
+#ifdef CONFIG_ACPI
static struct acpi_device_id rt5640_acpi_match[] = {
{ "INT33CA", 0 },
{ },
};
MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);
+#endif
static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np)
{