diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/s390/kernel/compat_linux.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/s390/kernel/compat_linux.c')
| -rw-r--r-- | arch/s390/kernel/compat_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 11c3aba664ea..73b624ed9cd8 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/sem.h> | 29 | #include <linux/sem.h> |
| 30 | #include <linux/msg.h> | 30 | #include <linux/msg.h> |
| 31 | #include <linux/shm.h> | 31 | #include <linux/shm.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/uio.h> | 32 | #include <linux/uio.h> |
| 34 | #include <linux/quota.h> | 33 | #include <linux/quota.h> |
| 35 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| @@ -52,6 +51,7 @@ | |||
| 52 | #include <linux/ptrace.h> | 51 | #include <linux/ptrace.h> |
| 53 | #include <linux/fadvise.h> | 52 | #include <linux/fadvise.h> |
| 54 | #include <linux/ipc.h> | 53 | #include <linux/ipc.h> |
| 54 | #include <linux/slab.h> | ||
| 55 | 55 | ||
| 56 | #include <asm/types.h> | 56 | #include <asm/types.h> |
| 57 | #include <asm/uaccess.h> | 57 | #include <asm/uaccess.h> |