]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: intel: make function stub static
authorRandy Dunlap <rdunlap@infradead.org>
Fri, 20 May 2016 15:38:54 +0000 (08:38 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 30 May 2016 15:15:45 +0000 (16:15 +0100)
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/sst-acpi.h

index 8398cb227ba9224bab3344aa908e44c8696f2b67..b02f12900b93e64633a8617877d2dccb8b924598 100644 (file)
@@ -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;
 }