diff mbox

: ASoC: intel: make function stub static

Message ID 573F2F8E.5020704@infradead.org (mailing list archive)
State Accepted
Commit 2d0b29dca8d6fe49a73cfc16888c1d2e55111d7b
Headers show

Commit Message

Randy Dunlap May 20, 2016, 3:38 p.m. UTC
From: Randy Dunlap <rdunlap@infradead.org>

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: f17131a93f43: add function stub when ACPI is not enabled

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox


--- linux-next-20160520.orig/sound/soc/intel/common/sst-acpi.h
+++ linux-next-20160520/sound/soc/intel/common/sst-acpi.h
@@ -20,7 +20,7 @@ 
 const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]);
-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;