* [PATCH] ASoC: intel: add function stub when ACPI is not enabled
@ 2016-03-29 16:45 Randy Dunlap
0 siblings, 0 replies; only message in thread
From: Randy Dunlap @ 2016-03-29 16:45 UTC (permalink / raw)
To: moderated for non-subscribers, LKML
Cc: Borislav Petkov, Takashi Iwai, Mark Brown, Liam Girdwood,
Subhransu S. Prusty, Jie Yang
From: Randy Dunlap <rdunlap@infradead.org>
Add function stub for "sst_acpi_find_name_from_hid()"
when CONFIG_ACPI is not enabled so that the driver will build
successfully. This fixes the following build errors:
(loadable module)
ERROR: "sst_acpi_find_name_from_hid" [sound/soc/intel/boards/snd-soc-sst-bytcr-rt5640.ko] undefined!
(or built-in)
bytcr_rt5640.c:(.text+0x26fc52): undefined reference to `sst_acpi_find_name_from_hid'
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: alsa-devel@alsa-project.org
---
sound/soc/intel/common/sst-acpi.h | 9 +++++++++
1 file changed, 9 insertions(+)
--- linux-next-20160308.orig/sound/soc/intel/common/sst-acpi.h
+++ linux-next-20160308/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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-29 16:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29 16:45 [PATCH] ASoC: intel: add function stub when ACPI is not enabled Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox