summaryrefslogtreecommitdiff
path: root/arch/mn10300/kernel/process.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-19 09:37:31 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-19 09:37:31 +0200
commitd819c49da624e3ee09b2844603d58265039eecdd (patch)
tree09a503b98769767d81337ec8e5c14c60874a4e77 /arch/mn10300/kernel/process.c
parentf18f982abf183e91f435990d337164c7a43d1e6d (diff)
parent9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff)
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/mn10300/kernel/process.c')
-rw-r--r--arch/mn10300/kernel/process.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index 3b0d579fc15d..9c623c88387b 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -20,7 +20,6 @@
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
-#include <linux/a.out.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/reboot.h>