diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:04 +0100 |
| commit | 38e8c895d33b0642dc341f83cce0adde4cffbc82 (patch) | |
| tree | 3657c043986d5c944f971c9685ae4a68f5a5b035 /sound/soc/omap/omap-twl4030.c | |
| parent | d66e065c5b8b64b03a9d9b8a7c5d674c7dfa2e3d (diff) | |
| parent | 69b6f19622ce0aef41df884b75e3f789c64b89c0 (diff) | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/omap/omap-twl4030.c')
| -rw-r--r-- | sound/soc/omap/omap-twl4030.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index fd98509d0f49..2a9324f794d8 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c @@ -43,7 +43,6 @@ #include <sound/jack.h> #include "omap-mcbsp.h" -#include "omap-pcm.h" struct omap_twl4030 { int jack_detect; /* board can detect jack events */ |