diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /arch/m68k/kernel/process.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/m68k/kernel/process.c')
| -rw-r--r-- | arch/m68k/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 17c3f325255d..1a6be27cf165 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
| @@ -15,13 +15,13 @@ | |||
| 15 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 19 | #include <linux/smp.h> | 20 | #include <linux/smp.h> |
| 20 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
| 21 | #include <linux/stddef.h> | 22 | #include <linux/stddef.h> |
| 22 | #include <linux/unistd.h> | 23 | #include <linux/unistd.h> |
| 23 | #include <linux/ptrace.h> | 24 | #include <linux/ptrace.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <linux/user.h> | 25 | #include <linux/user.h> |
| 26 | #include <linux/reboot.h> | 26 | #include <linux/reboot.h> |
| 27 | #include <linux/init_task.h> | 27 | #include <linux/init_task.h> |