summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/user.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-08 15:45:45 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-08 15:45:45 +0100
commit364f6c717deef4a3ac4982e670fa9846b43cd060 (patch)
tree47e3967d6e2220130f2c070e300c97709143b28f /include/asm-s390/user.h
parent4ff4258a3e558814a3d48c50a59cd22f56bbea2f (diff)
parent1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 (diff)
downloadop-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.zip
op-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.tar.gz
Automatic merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'include/asm-s390/user.h')
-rw-r--r--include/asm-s390/user.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/user.h b/include/asm-s390/user.h
index c64f8c1..1dc74ba 100644
--- a/include/asm-s390/user.h
+++ b/include/asm-s390/user.h
@@ -10,7 +10,7 @@
#define _S390_USER_H
#include <asm/page.h>
-#include <linux/ptrace.h>
+#include <asm/ptrace.h>
/* Core file format: The core file is written in such a way that gdb
can understand it and provide useful information to the user (under
linux we use the 'trad-core' bfd). There are quite a number of
OpenPOWER on IntegriCloud