diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-25 04:04:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 04:04:32 -0400 |
| commit | daedc71836e5a398fd0cc0e12c5cb43539478485 (patch) | |
| tree | c56567a92017679e57195cef992d4a5561c20e0e /arch/blackfin/kernel/ptrace.c | |
| parent | c36ba80ea01d0aecb652c26799a912e760ce8981 (diff) | |
| parent | 422bef879e84104fee6dc68ded0e371dbeb5f88e (diff) | |
Merge commit 'v2.6.31-rc7' into irq/core
Merge reason: move from an -rc2 base to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/kernel/ptrace.c')
| -rw-r--r-- | arch/blackfin/kernel/ptrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c index d76618db50df..6a387eec6b65 100644 --- a/arch/blackfin/kernel/ptrace.c +++ b/arch/blackfin/kernel/ptrace.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/mm.h> | 32 | #include <linux/mm.h> |
| 33 | #include <linux/smp.h> | 33 | #include <linux/smp.h> |
| 34 | #include <linux/smp_lock.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/ptrace.h> | 35 | #include <linux/ptrace.h> |
| 37 | #include <linux/user.h> | 36 | #include <linux/user.h> |