diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-07-23 16:57:53 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-07-23 16:57:53 +0200 |
| commit | 6c910fc6c66839a0d88d83174ac06a0e0844e269 (patch) | |
| tree | 4ca37da872dcefc7c986ba0291ad8ed50f85d256 /sound/soc/omap | |
| parent | 1bc3dadd96b32910d2c135b461bfe0095b7edab9 (diff) | |
| download | kernel_goldelico_gta04-6c910fc6c66839a0d88d83174ac06a0e0844e269.zip kernel_goldelico_gta04-6c910fc6c66839a0d88d83174ac06a0e0844e269.tar.gz kernel_goldelico_gta04-6c910fc6c66839a0d88d83174ac06a0e0844e269.tar.bz2 | |
fixed (or commented with FIXME/#warning) to get the whole package compiled
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-fm.c | 1 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 2860c22..9ba61e8 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -20,7 +20,7 @@ snd-soc-am3517evm-objs := am3517evm.o snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o snd-soc-omap-twl4030-objs := omap-twl4030.o snd-soc-omap3pandora-objs := omap3pandora.o -snd-soc-gta04-objs := gta04-audio.o gta04-voice.o gta04-headset.o gta04-fm.o +snd-soc-gta04-objs := gta04-audio.o gta04-voice.o gta04-headset.o gta04-jack.o gta04-fm.o snd-soc-zoom2-objs := zoom2.o snd-soc-omap-hdmi-card-objs := omap-hdmi-card.o diff --git a/sound/soc/omap/gta04-fm.c b/sound/soc/omap/gta04-fm.c index bcf81ed..3bc0a0f 100644 --- a/sound/soc/omap/gta04-fm.c +++ b/sound/soc/omap/gta04-fm.c @@ -25,7 +25,6 @@ #include "mcbsp.h" #include "omap-mcbsp.h" -#include "omap-pcm.h" #include "../codecs/si47xx.h" /* FCLK is 96 MHz and is divided by the CLOCK_DIVISOR to generate the McBSP CLKX signal diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index a3894cc..981e855 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -559,7 +559,7 @@ static int omap_mcbsp_dai_set_tristate(struct snd_soc_dai *dai, case 3: gpio=140; break; /* may also be GPIO 144 or 158 in different modes! */ case 4: gpio=154; break; /* may also be on GPIO 57 in different mode! */ case 5: gpio=20; mode = OMAP_MUX_MODE1; break; - default: -EIO; + default: return -EIO; } /* should check for errors */ |