diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-07-24 21:08:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-07-24 21:08:13 +0300 |
| commit | 43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa (patch) | |
| tree | 1057babea8807af3f4a3c44fd116b7bbe99eb733 /include/linux/dmapool.h | |
| parent | cba59972a1191a0c1647a52fe745eed7a4b34b38 (diff) | |
| parent | 996034b117b467709dec7811ef134063934fa626 (diff) | |
| download | linux-43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa.tar.xz | |
Merge tag 'asoc-fix-v4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'include/linux/dmapool.h')
| -rw-r--r-- | include/linux/dmapool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h index 52456aa566a0..e1043f79122f 100644 --- a/include/linux/dmapool.h +++ b/include/linux/dmapool.h @@ -11,8 +11,8 @@ #ifndef LINUX_DMAPOOL_H #define LINUX_DMAPOOL_H +#include <linux/scatterlist.h> #include <asm/io.h> -#include <asm/scatterlist.h> struct device; |