diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-13 09:57:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-13 09:57:10 +0200 |
| commit | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (patch) | |
| tree | a2c186cb828e3713c2ec48a4d7191166fb798b3d /arch/cris/arch-v32/kernel/ptrace.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Linux 3.4-rc2 (diff) | |
| download | linux-a385ec4f11bdcf81af094c03e2444ee9b7fad2e5.tar.xz linux-a385ec4f11bdcf81af094c03e2444ee9b7fad2e5.zip | |
Merge tag 'v3.4-rc2' into perf/core
Merge Linux 3.4-rc2: we were on v3.3, update the base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/cris/arch-v32/kernel/ptrace.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/ptrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c index 511ece94a574..f7ad9e8637df 100644 --- a/arch/cris/arch-v32/kernel/ptrace.c +++ b/arch/cris/arch-v32/kernel/ptrace.c @@ -15,7 +15,6 @@ #include <asm/uaccess.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/system.h> #include <asm/processor.h> #include <arch/hwregs/supp_reg.h> |