diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:30 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:30 +0100 |
commit | d45a26bd9790fcde58cf4b11a775ff56c6b44e0b (patch) | |
tree | 71b75e94b7a586123331eed46e91d25dd88ff52a /sound/soc/omap/omap-abe-twl6040.c | |
parent | 8ef53f689afea7f2da360cb27d7af040c1216bfa (diff) | |
parent | 22f38f792ec53e2a93be13ecb609bbe911ed8ff9 (diff) |
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 e7d93fa412a..70cd5c7b2e1 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 { |