aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:54:39 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:54:39 +0200
commitb8aab194eedbdff90ec94df66504ef56cd28318a (patch)
tree3e861f0f368d7729d524cea7baddb1dff08b9a89
parent686e483ff6ed2d1fae692912c21839a227dd749d (diff)
downloadkernel_goldelico_gta04-b8aab194eedbdff90ec94df66504ef56cd28318a.zip
kernel_goldelico_gta04-b8aab194eedbdff90ec94df66504ef56cd28318a.tar.gz
kernel_goldelico_gta04-b8aab194eedbdff90ec94df66504ef56cd28318a.tar.bz2
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--sound/soc/omap/gta04-audio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c
index f2cc945..b4f7051 100644
--- a/sound/soc/omap/gta04-audio.c
+++ b/sound/soc/omap/gta04-audio.c
@@ -36,7 +36,6 @@
#include <linux/i2c/twl4030-madc.h>
#include "omap-mcbsp.h"
-#include "omap-pcm.h"
#include "../codecs/twl4030.h"
static int omap3gta04_hw_params(struct snd_pcm_substream *substream,