diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 11:12:13 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 11:12:26 -0500 |
| commit | 6b60805502fecc5ce05dad68fd242c4f3a1d1f1b (patch) | |
| tree | a53537e00ede0a31b8f9f91c1d79d1e1a6670797 /arch/s390/kernel/ptrace.c | |
| parent | 4c75aab698d4b7cc08f3a5dd329fc7e9af3d0e3c (diff) | |
| parent | af829310e8a914ad17ed61a7b18b14b4f457bca1 (diff) | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux: (3 commits)
ARM: pxa: fix invalid mfp pin issue
ARM: pxa: remove duplicated registeration on pxa-gpio
ARM: pxa: add dummy clock for pxa25x and pxa27x
Includes an update to v3.3-rc6
Diffstat (limited to 'arch/s390/kernel/ptrace.c')
| -rw-r--r-- | arch/s390/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 9d82ed4bcb27..61f95489d70c 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <linux/regset.h> | 20 | #include <linux/regset.h> |
| 21 | #include <linux/tracehook.h> | 21 | #include <linux/tracehook.h> |
| 22 | #include <linux/seccomp.h> | 22 | #include <linux/seccomp.h> |
| 23 | #include <linux/compat.h> | ||
| 23 | #include <trace/syscall.h> | 24 | #include <trace/syscall.h> |
| 24 | #include <asm/compat.h> | ||
| 25 | #include <asm/segment.h> | 25 | #include <asm/segment.h> |
| 26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
| 27 | #include <asm/pgtable.h> | 27 | #include <asm/pgtable.h> |