: ASoC: intel: make function stub static
Subsystems (3)
PATCH 1/1 : ASoC: intel: make function stub static
From: Randy Dunlap <[email protected]>
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
--- sound/soc/intel/common/sst-acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/common/sst-acpi.h +1 -1
@@ -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 ; }
Mark Brown
maintainerApplied "ASoC: intel: make function stub static" to the asoc tree
The patch
ASoC: intel: make function stub static
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
284f6829aedfa77e0135066b75d0c81464bbe904Mon Sep 17 00:00:00 2001
From: Randy Dunlap <[email protected]>
Date: Fri, 20 May 2016 08:38:54 -0700
Subject: [PATCH] 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
--- sound/soc/intel/common/sst-acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/common/sst-acpi.h +1 -1
@@ -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 ; }
Signature · 1 line
2.8.1