diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 16:02:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 16:02:06 -0700 |
| commit | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (patch) | |
| tree | 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418 /arch/s390/kernel/sys_s390.c | |
| parent | dcbb5593d980bbf4ceef320f8c75210398ed84db (diff) | |
| parent | 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
includecheck fix: x86, cpu/common.c
includecheck fix: kernel/trace, ring_buffer.c
includecheck fix: include/linux, ftrace.h
includecheck fix: include/linux, page_cgroup.h
includecheck fix: include/linux, aio.h
includecheck fix: include/drm, drm_memory.h
includecheck fix: include/acpi, acpi_bus.h
includecheck fix: drivers/xen, evtchn.c
includecheck fix: drivers/video, vgacon.c
includecheck fix: drivers/scsi, ibmvscsi.c
includecheck fix: drivers/scsi, libfcoe.c
includecheck fix: x86, shadow.c
includecheck fix: x86, traps.c
includecheck fix: um, helper.c
includecheck fix: s390, sys_s390.c
Diffstat (limited to 'arch/s390/kernel/sys_s390.c')
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index c7ae4b17e0e3..e9d94f61d500 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -29,7 +29,6 @@ #include <linux/personality.h> #include <linux/unistd.h> #include <linux/ipc.h> -#include <linux/syscalls.h> #include <asm/uaccess.h> #include "entry.h" |