diff options
author | Thierry Reding <thierry.reding@gmail.com> | 2013-09-19 05:18:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-19 06:41:03 -0400 |
commit | 32fcb97b9f699f63742bcaadca6e0beede86e8e8 (patch) | |
tree | f398db1c4680891c8b7b6b8bea372e3623b9f82a /sound/soc/codecs/rt5640.c | |
parent | 02b80773de3732dae11c1cf0c1ce40378901bd0e (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.c | 2 |
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[] = { | |||
2082 | }; | 2082 | }; |
2083 | MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); | 2083 | MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); |
2084 | 2084 | ||
2085 | #ifdef CONFIG_ACPI | ||
2085 | static struct acpi_device_id rt5640_acpi_match[] = { | 2086 | static struct acpi_device_id rt5640_acpi_match[] = { |
2086 | { "INT33CA", 0 }, | 2087 | { "INT33CA", 0 }, |
2087 | { }, | 2088 | { }, |
2088 | }; | 2089 | }; |
2089 | MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match); | 2090 | MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match); |
2091 | #endif | ||
2090 | 2092 | ||
2091 | static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np) | 2093 | static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np) |
2092 | { | 2094 | { |