git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
ptrace.c
diff --git
a/arch/cris/arch-v32/kernel/ptrace.c
b/arch/cris/arch-v32/kernel/ptrace.c
index e27f4670e88e1df11bf35e8fea46649e6da23f63..dd401473f5b5e8742a1f424e7650a0265c28fdbc 100644
(file)
--- a/
arch/cris/arch-v32/kernel/ptrace.c
+++ b/
arch/cris/arch-v32/kernel/ptrace.c
@@
-17,7
+17,7
@@
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/processor.h>
-#include <a
sm/a
rch/hwregs/supp_reg.h>
+#include <arch/hwregs/supp_reg.h>
/*
* Determines which bits in CCS the user has access to.