diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:14 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:14 -0500 |
| commit | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (patch) | |
| tree | bc4b414c7eca762c0bac1176bd1d63b74c9f965e /kernel/power/console.c | |
| parent | 3417ae1f5f59bbf36c3defbbf2a76c5ca498db2a (diff) | |
| parent | 48573a893303986e3b0b2974d6fb11f3d1bb7064 (diff) | |
Merge branch 'for-3.14-fixes' into for-3.15
Pending kernfs conversion depends on fixes in for-3.14-fixes. Pull it
into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/power/console.c')
| -rw-r--r-- | kernel/power/console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index eacb8bd8cab..aba9c545a0e 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -9,6 +9,7 @@ #include <linux/kbd_kern.h> #include <linux/vt.h> #include <linux/module.h> +#include <linux/slab.h> #include "power.h" #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) |