diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-06-03 11:51:14 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-06-03 11:51:14 +0200 |
commit | 8743dcd6639c28204ac03fb3e9db7932e3d85418 (patch) | |
tree | 53b80846cf6731ddb196d522ed2bbf0f76da8344 /sound/soc/omap/omap-dmic.c | |
parent | efd4b76ef789541e7046e873b3546209352cdb59 (diff) | |
parent | e1d4d3c854f25cff6c6c139588570e124d5e8fa4 (diff) | |
download | linux-8743dcd6639c28204ac03fb3e9db7932e3d85418.tar.bz2 |
Merge tag 'asoc-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.16
A few more updates from the last week of development, nothing too
exciting. Highlights include:
- GPIO descriptor support for jacks
- More updates and fixes to the Freescale SSI, Intel and rsnd drivers.
- New drivers for Analog Devices ADAU1361, ADAU1381, ADAU1761 and
ADAU1781, and Realtek RT5677.
Diffstat (limited to 'sound/soc/omap/omap-dmic.c')
-rw-r--r-- | sound/soc/omap/omap-dmic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 53da041896c4..6925d7141215 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -40,9 +40,9 @@ #include <sound/initval.h> #include <sound/soc.h> #include <sound/dmaengine_pcm.h> +#include <sound/omap-pcm.h> #include "omap-dmic.h" -#include "omap-pcm.h" struct omap_dmic { struct device *dev; |