diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2016-05-20 08:38:54 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-30 16:15:45 +0100 |
| commit | 2d0b29dca8d6fe49a73cfc16888c1d2e55111d7b (patch) | |
| tree | 15e549318bf5c2c8ff12618adfd738dd660f0bb3 /sound/soc/intel/common | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| download | linux-stable-2d0b29dca8d6fe49a73cfc16888c1d2e55111d7b.tar.gz linux-stable-2d0b29dca8d6fe49a73cfc16888c1d2e55111d7b.tar.bz2 linux-stable-2d0b29dca8d6fe49a73cfc16888c1d2e55111d7b.zip | |
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: 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>
Diffstat (limited to 'sound/soc/intel/common')
| -rw-r--r-- | sound/soc/intel/common/sst-acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h index 8398cb227ba9..b02f12900b93 100644 --- a/sound/soc/intel/common/sst-acpi.h +++ b/sound/soc/intel/common/sst-acpi.h @@ -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; } |