diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 16:26:22 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 16:26:22 +0300 |
| commit | c988e26130132813e3550a7b97ab2ed2ae0455eb (patch) | |
| tree | 9259bd3e05c9a3f607051501ece7c252785f2e22 /sound/soc/intel/common/sst-acpi.h | |
| parent | 35302156ea791f96bdc7e0ca3c44cb25341fbcb1 (diff) | |
| parent | b2047e996cd88d36eb0f4e84fe6aedab831a4b31 (diff) | |
| download | linux-c988e26130132813e3550a7b97ab2ed2ae0455eb.tar.xz | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/common/sst-acpi.h')
| -rw-r--r-- | sound/soc/intel/common/sst-acpi.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h index 4dcfb7e5ed70..8398cb227ba9 100644 --- a/sound/soc/intel/common/sst-acpi.h +++ b/sound/soc/intel/common/sst-acpi.h @@ -12,10 +12,19 @@ * */ +#include <linux/kconfig.h> +#include <linux/stddef.h> #include <linux/acpi.h> /* translation fron HID to I2C name, needed for DAI codec_name */ +#if IS_ENABLED(CONFIG_ACPI) const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]); +#else +inline const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]) +{ + return NULL; +} +#endif /* acpi match */ struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines); |