diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /arch/h8300/kernel | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/h8300/kernel')
| -rw-r--r-- | arch/h8300/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c index bd883faa983d..8c8b0ffa6ad7 100644 --- a/arch/h8300/kernel/process.c +++ b/arch/h8300/kernel/process.c | |||
| @@ -32,11 +32,11 @@ | |||
| 32 | #include <linux/stddef.h> | 32 | #include <linux/stddef.h> |
| 33 | #include <linux/unistd.h> | 33 | #include <linux/unistd.h> |
| 34 | #include <linux/ptrace.h> | 34 | #include <linux/ptrace.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/user.h> | 35 | #include <linux/user.h> |
| 37 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 38 | #include <linux/reboot.h> | 37 | #include <linux/reboot.h> |
| 39 | #include <linux/fs.h> | 38 | #include <linux/fs.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | 40 | ||
| 41 | #include <asm/uaccess.h> | 41 | #include <asm/uaccess.h> |
| 42 | #include <asm/system.h> | 42 | #include <asm/system.h> |