aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:55:54 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-07-21 00:55:54 +0200
commit4fd90e37816706f20da0eefee070a0722c8e2a95 (patch)
tree4b8f3c4ba4fa810edf87d76668e48c94fb31c7b8
parentb8aab194eedbdff90ec94df66504ef56cd28318a (diff)
downloadkernel_goldelico_gta04-4fd90e37816706f20da0eefee070a0722c8e2a95.zip
kernel_goldelico_gta04-4fd90e37816706f20da0eefee070a0722c8e2a95.tar.gz
kernel_goldelico_gta04-4fd90e37816706f20da0eefee070a0722c8e2a95.tar.bz2
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--sound/soc/omap/gta04-headset.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/gta04-headset.c b/sound/soc/omap/gta04-headset.c
index d266492..61162ab 100644
--- a/sound/soc/omap/gta04-headset.c
+++ b/sound/soc/omap/gta04-headset.c
@@ -24,7 +24,6 @@
#include <sound/soc-dapm.h>
#include "omap-mcbsp.h"
-#include "omap-pcm.h"
#include "../codecs/w2cbw003-bt.h"
static int gta04_headset_hw_params(struct snd_pcm_substream *substream,