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 /sound/core/rawmidi.c | |
parent | f25d384755191690b1196776d319cb6a4e899f28 (diff) | |
parent | 093b995e3b55a0ae0670226ddfcb05bfbf0099ae (diff) |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/core/rawmidi.c')
-rw-r--r-- | sound/core/rawmidi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 8da9cb245d01..ab890336175f 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -22,7 +22,7 @@ #include <sound/core.h> #include <linux/major.h> #include <linux/init.h> -#include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/slab.h> #include <linux/time.h> #include <linux/wait.h> |