diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /arch/h8300/kernel/process.c | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'arch/h8300/kernel/process.c')
| -rw-r--r-- | arch/h8300/kernel/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c index dfbe7ab9ffe2..a8ef654a5a0b 100644 --- a/arch/h8300/kernel/process.c +++ b/arch/h8300/kernel/process.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/ptrace.h> | 34 | #include <linux/ptrace.h> |
| 35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
| 36 | #include <linux/user.h> | 36 | #include <linux/user.h> |
| 37 | #include <linux/a.out.h> | ||
| 38 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| 39 | #include <linux/reboot.h> | 38 | #include <linux/reboot.h> |
| 40 | #include <linux/fs.h> | 39 | #include <linux/fs.h> |