summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/ptrace.h
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-02-03 19:38:41 +0300
committerFelix Blyakher <felixb@sgi.com>2009-02-03 19:38:41 +0300
commit6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch)
tree8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/m68k/include/asm/ptrace.h
parentf0e0059b9c18426cffdcc04161062251a8f9741e (diff)
parentb1792e367053968f2ddb48bc911d314143ce6242 (diff)
downloadlinux-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/m68k/include/asm/ptrace.h')
-rw-r--r--arch/m68k/include/asm/ptrace.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
new file mode 100644
index 000000000000..e83cd2f66101
--- /dev/null
+++ b/arch/m68k/include/asm/ptrace.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "ptrace_no.h"
+#else
+#include "ptrace_mm.h"
+#endif