diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:11:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:11:42 +0200 |
| commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
| tree | 0816c565d26ae24854616faa0d497be365c2fe8b /arch/mn10300/kernel/setup.c | |
| parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
| download | op-kernel-dev-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.zip op-kernel-dev-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.tar.gz | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/mn10300/kernel/setup.c')
| -rw-r--r-- | arch/mn10300/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 6b7ce26..017121c 100644 --- 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/a.out.h> #include <linux/tty.h> #include <linux/ioport.h> #include <linux/delay.h> |
