diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
| commit | d819c49da624e3ee09b2844603d58265039eecdd (patch) | |
| tree | 09a503b98769767d81337ec8e5c14c60874a4e77 /arch/mn10300/kernel/process.c | |
| parent | f18f982abf183e91f435990d337164c7a43d1e6d (diff) | |
| parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/mn10300/kernel/process.c')
| -rw-r--r-- | arch/mn10300/kernel/process.c | 1 |
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 @@ | |||
| 20 | #include <linux/ptrace.h> | 20 | #include <linux/ptrace.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/user.h> | 22 | #include <linux/user.h> |
| 23 | #include <linux/a.out.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/reboot.h> | 25 | #include <linux/reboot.h> |