diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /arch/s390/kernel/compat_linux.h | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'arch/s390/kernel/compat_linux.h')
| -rw-r--r-- | arch/s390/kernel/compat_linux.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h index 45e9092b3aad..cb97afc85c94 100644 --- a/arch/s390/kernel/compat_linux.h +++ b/arch/s390/kernel/compat_linux.h | |||
| @@ -4,10 +4,6 @@ | |||
| 4 | #include <linux/compat.h> | 4 | #include <linux/compat.h> |
| 5 | #include <linux/socket.h> | 5 | #include <linux/socket.h> |
| 6 | #include <linux/syscalls.h> | 6 | #include <linux/syscalls.h> |
| 7 | #include <linux/nfs_fs.h> | ||
| 8 | #include <linux/sunrpc/svc.h> | ||
| 9 | #include <linux/nfsd/nfsd.h> | ||
| 10 | #include <linux/nfsd/export.h> | ||
| 11 | 7 | ||
| 12 | /* Macro that masks the high order bit of an 32 bit pointer and converts it*/ | 8 | /* Macro that masks the high order bit of an 32 bit pointer and converts it*/ |
| 13 | /* to a 64 bit pointer */ | 9 | /* to a 64 bit pointer */ |