diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 14:57:04 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 14:57:04 +0200 |
commit | 38e8c895d33b0642dc341f83cce0adde4cffbc82 (patch) | |
tree | 3657c043986d5c944f971c9685ae4a68f5a5b035 /sound/soc/omap/omap-abe-twl6040.c | |
parent | Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next (diff) | |
parent | ASoC: ux500_pcm: Use the same snd_pcm_hardware for playback and capture (diff) | |
download | linux-38e8c895d33b0642dc341f83cce0adde4cffbc82.tar.xz linux-38e8c895d33b0642dc341f83cce0adde4cffbc82.zip |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
-rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index e7d93fa412a9..70cd5c7b2e14 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -34,7 +34,6 @@ #include "omap-dmic.h" #include "omap-mcpdm.h" -#include "omap-pcm.h" #include "../codecs/twl6040.h" struct abe_twl6040 { |