projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
kernel
/
kexec_file.c
diff --git
a/kernel/kexec_file.c
b/kernel/kexec_file.c
index
c6a3b68
..
35cf0ad
100644
(file)
--- a/
kernel/kexec_file.c
+++ b/
kernel/kexec_file.c
@@
-25,8
+25,6
@@
#include <linux/elf.h>
#include <linux/elfcore.h>
#include <linux/kernel.h>
-#include <linux/kexec.h>
-#include <linux/slab.h>
#include <linux/syscalls.h>
#include <linux/vmalloc.h>
#include "kexec_internal.h"