diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:29 +0100 |
| commit | 5561f17f2629cdacf5bc43e0f839ca6434db2c20 (patch) | |
| tree | c0e1acfcc969c81d5d072ee3b512a934d99a7ec2 /sound/soc/omap/omap-twl4030.c | |
| parent | 423a5e0fd46de6bd92c52b2ef136856929eeb649 (diff) | |
| parent | d486fea6babfe3ff0c382c9e4baf18f535fcee7d (diff) | |
| download | linux-5561f17f2629cdacf5bc43e0f839ca6434db2c20.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/davinci' 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 */ |