projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes'
[powerpc.git]
/
arch
/
powerpc
/
kernel
/
ptrace.c
diff --git
a/arch/powerpc/kernel/ptrace.c
b/arch/powerpc/kernel/ptrace.c
index
3d2abd9
..
400793c
100644
(file)
--- a/
arch/powerpc/kernel/ptrace.c
+++ b/
arch/powerpc/kernel/ptrace.c
@@
-36,8
+36,9
@@
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/system.h>
+
#ifdef CONFIG_PPC64
-#include
<asm/ptrace-common.h>
+#include
"ptrace-common.h"
#endif
#ifdef CONFIG_PPC32