aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin/bf5xx-ssm2602.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-13 08:37:24 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-13 08:37:24 +0100
commit6db9a0f326d3144d790d9479309df480a8f562e4 (patch)
tree650a8950c35c087278ecee1b8d123f75f601ebc8 /sound/soc/blackfin/bf5xx-ssm2602.c
parentc400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff)
parent18b022eb117e7f70c191267551ff865f278a9258 (diff)
downloadkernel_samsung_tuna-6db9a0f326d3144d790d9479309df480a8f562e4.zip
kernel_samsung_tuna-6db9a0f326d3144d790d9479309df480a8f562e4.tar.gz
kernel_samsung_tuna-6db9a0f326d3144d790d9479309df480a8f562e4.tar.bz2
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ssm2602.c')
-rw-r--r--sound/soc/blackfin/bf5xx-ssm2602.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c
index 36f2769..e902b24 100644
--- a/sound/soc/blackfin/bf5xx-ssm2602.c
+++ b/sound/soc/blackfin/bf5xx-ssm2602.c
@@ -33,7 +33,6 @@
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/soc.h>
-#include <sound/soc-dapm.h>
#include <sound/pcm_params.h>
#include <asm/dma.h>