aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:50:08 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:50:08 +0200
commit5aeebdcdf49f8601bcb4d26b92a9561f99dfcf6e (patch)
tree801cc0fc846a00f29cf23b380ed674af58ed6dbb
parent9b1a4edf0361d6f6ddaa01db1d66ea1bee18ec5f (diff)
downloadkernel_goldelico_gta04-5aeebdcdf49f8601bcb4d26b92a9561f99dfcf6e.zip
kernel_goldelico_gta04-5aeebdcdf49f8601bcb4d26b92a9561f99dfcf6e.tar.gz
kernel_goldelico_gta04-5aeebdcdf49f8601bcb4d26b92a9561f99dfcf6e.tar.bz2
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--sound/soc/omap/gta04-voice.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/gta04-voice.c b/sound/soc/omap/gta04-voice.c
index c2c7619..bb54381 100644
--- a/sound/soc/omap/gta04-voice.c
+++ b/sound/soc/omap/gta04-voice.c
@@ -24,7 +24,6 @@
#include <sound/soc-dapm.h>
#include "omap-mcbsp.h"
-#include "omap-pcm.h"
#include "../codecs/gtm601.h"
static int gta04_voice_hw_params(struct snd_pcm_substream *substream,