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 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
setup_64.c
diff --git
a/arch/x86/kernel/setup_64.c
b/arch/x86/kernel/setup_64.c
index
a49f5f7
..
c0d8208
100644
(file)
--- a/
arch/x86/kernel/setup_64.c
+++ b/
arch/x86/kernel/setup_64.c
@@
-15,7
+15,6
@@
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
-#include <linux/a.out.h>
#include <linux/screen_info.h>
#include <linux/ioport.h>
#include <linux/delay.h>