diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:02:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:02:56 -0800 |
| commit | c688f14ccd4266289fd51e76210c13fdf67f1d9d (patch) | |
| tree | 3bcf79ff8da8e83e7986c3db275261deb20bf10a /drivers | |
| parent | 9e91c144e689bb780b412c2c7908b9cf7b96f31f (diff) | |
| parent | 5c51f4ae84df0f9df33ac08aa5be50061a8b4242 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"A couple of sched.h splitup related build fixes, plus an objtool fix"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Fix another GCC jump table detection issue
drivers/char/nwbutton: Fix build breakage caused by include file reshuffling
h8300: Fix build breakage caused by header file changes
avr32: Fix build error caused by include file reshuffling
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/nwbutton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index a5b1eb276c0b..e6d0d271c58c 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c @@ -6,7 +6,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/interrupt.h> #include <linux/time.h> #include <linux/timer.h> |