aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390/user.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-06-06 02:21:03 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-06-06 02:21:03 -0500
commit3c241f8337542655ee013a661b7f1770f561d3ef (patch)
tree79dd9a5dd12d305e1be7b926d414855377d2e192 /include/asm-s390/user.h
parentdbf4ccd6043e58ed32fbf253fb3f0a9991e4c13a (diff)
parenteae936e21bd726f9d9555f2262d439fbcd61dccf (diff)
downloadkernel_samsung_smdk4412-3c241f8337542655ee013a661b7f1770f561d3ef.zip
kernel_samsung_smdk4412-3c241f8337542655ee013a661b7f1770f561d3ef.tar.gz
kernel_samsung_smdk4412-3c241f8337542655ee013a661b7f1770f561d3ef.tar.bz2
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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