Commit 2d0b29dc authored May 20, 2016 by Randy Dunlap Committed by Mark Brown May 30, 2016

ASoC: intel: make function stub static



This function stub should have been 'static' in the original patch
so that multiple uses of the header file (in different drivers)
will not cause multiple function definitions.

sound/soc/intel/boards/built-in.o: In function `sst_acpi_find_name_from_hid':
(.text+0x560): multiple definition of `sst_acpi_find_name_from_hid'
sound/soc/intel/atom/built-in.o:(.text+0x10610): first defined here
../scripts/Makefile.build:369: recipe for target 'sound/soc/intel/built-in.o' failed

Fixes: f17131a9: add function stub when ACPI is not enabled

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1a695a90

sound/soc/intel/common/sst-acpi.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#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])
		static inline const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
		{
		return NULL;
		}