diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
| commit | 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 (patch) | |
| tree | 456799ad9fce41cdb2186ba3872c7a077ec3bd05 /arch/powerpc/kernel/ptrace.c | |
| parent | d67e7ebb2a15bf0429c55f2fc1c4b02808367874 (diff) | |
| parent | 1b15688b31d8c88881102426279e8cc03953860b (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/powerpc/kernel/ptrace.c')
| -rw-r--r-- | arch/powerpc/kernel/ptrace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 3d2abd95c7ae..400793c71304 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c | |||
| @@ -36,8 +36,9 @@ | |||
| 36 | #include <asm/page.h> | 36 | #include <asm/page.h> |
| 37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
| 38 | #include <asm/system.h> | 38 | #include <asm/system.h> |
| 39 | |||
| 39 | #ifdef CONFIG_PPC64 | 40 | #ifdef CONFIG_PPC64 |
| 40 | #include <asm/ptrace-common.h> | 41 | #include "ptrace-common.h" |
| 41 | #endif | 42 | #endif |
| 42 | 43 | ||
| 43 | #ifdef CONFIG_PPC32 | 44 | #ifdef CONFIG_PPC32 |