git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
mn10300
/
kernel
/
setup.c
diff --git
a/arch/mn10300/kernel/setup.c
b/arch/mn10300/kernel/setup.c
index
6b7ce26
..
017121c
100644
(file)
--- a/
arch/mn10300/kernel/setup.c
+++ b/
arch/mn10300/kernel/setup.c
@@
-17,7
+17,6
@@
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
-#include <linux/a.out.h>
#include <linux/tty.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/tty.h>
#include <linux/ioport.h>
#include <linux/delay.h>