diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-23 09:35:01 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-23 15:39:25 +0100 |
| commit | eda21d37eb1e7d065d0427679d0947da805ad35d (patch) | |
| tree | 6c9eac7f9fdf65e62e62f668ece33282c609f62b /arch | |
| parent | b8101048f0f3cd281ed4c4901e38ae2bcfb32030 (diff) | |
| download | linux-stable-eda21d37eb1e7d065d0427679d0947da805ad35d.tar.gz linux-stable-eda21d37eb1e7d065d0427679d0947da805ad35d.tar.bz2 linux-stable-eda21d37eb1e7d065d0427679d0947da805ad35d.zip | |
ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 0606f238a247..5d142facb0e6 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c @@ -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; } |