diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
| commit | 4ccb6aea4b3eb97c94575d1ed4bf10744169f082 (patch) | |
| tree | a2ca8bc8b567608bd4067593b752f78c895d713b /include/sound/control.h | |
| parent | x86/asm: Optimize clear_page() (diff) | |
| parent | mm, swap: Remove WARN_ON_ONCE() in free_swap_slot() (diff) | |
| download | linux-4ccb6aea4b3eb97c94575d1ed4bf10744169f082.tar.xz linux-4ccb6aea4b3eb97c94575d1ed4bf10744169f082.zip | |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/sound/control.h')
| -rw-r--r-- | include/sound/control.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 21d047f229a1..bd7246de58e7 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -22,6 +22,7 @@ * */ +#include <linux/wait.h> #include <sound/asound.h> #define snd_kcontrol_chip(kcontrol) ((kcontrol)->private_data) |