iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled

Browse Source 
Fixes:
CC      arch/arm/mach-omap2/twl-common.o arch/arm/mach-omap2/twl-common.c:562: error: conflicting types for ‘omap_twl4030_audio_init’
arch/arm/mach-omap2/twl-common.h:62: error: previous declaration of ‘omap_twl4030_audio_init’ was here
make[1]: *** [arch/arm/mach-omap2/twl-common.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

When building the kernel with !SND_OMAP_SOC_OMAP_TWL4030

Reported-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2012-08-23 09:35:01 +03:00 committed by Mark Brown
parent b8101048f0
commit eda21d37eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/twl-common.c
View File

@ -559,7 +559,7 @@ void __init omap_twl4030_audio_init(char *card_name)
}
#else /* SOC_OMAP_TWL4030 */
void __init omap_twl4030_audio_init(char *card_name, int codec_sysclk)
void __init omap_twl4030_audio_init(char *card_name)
{
return;
}