aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:57:17 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:57:17 +0200
commit8e75485dd7490c2001a787907f4181c79d49f25f (patch)
treef40a3cf4533fe60e5383cbec5d51437f4c43c739
parent4fd90e37816706f20da0eefee070a0722c8e2a95 (diff)
downloadkernel_goldelico_gta04-8e75485dd7490c2001a787907f4181c79d49f25f.zip
kernel_goldelico_gta04-8e75485dd7490c2001a787907f4181c79d49f25f.tar.gz
kernel_goldelico_gta04-8e75485dd7490c2001a787907f4181c79d49f25f.tar.bz2
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--sound/soc/omap/gta04-fm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/gta04-fm.c b/sound/soc/omap/gta04-fm.c
index 228a8b0..06d469f 100644
--- a/sound/soc/omap/gta04-fm.c
+++ b/sound/soc/omap/gta04-fm.c
@@ -24,7 +24,6 @@
#include <sound/soc-dapm.h>
#include "omap-mcbsp.h"
-#include "omap-pcm.h"
#include "../codecs/si47xx.h"
static int gta04_fm_hw_params(struct snd_pcm_substream *substream,