diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /include/linux/nfsd/syscall.h | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/linux/nfsd/syscall.h')
| -rw-r--r-- | include/linux/nfsd/syscall.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 4e439765b705..7a3b565b898f 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h | |||
| @@ -9,9 +9,8 @@ | |||
| 9 | #ifndef NFSD_SYSCALL_H | 9 | #ifndef NFSD_SYSCALL_H |
| 10 | #define NFSD_SYSCALL_H | 10 | #define NFSD_SYSCALL_H |
| 11 | 11 | ||
| 12 | #include <asm/types.h> | ||
| 13 | #ifdef __KERNEL__ | ||
| 14 | # include <linux/types.h> | 12 | # include <linux/types.h> |
| 13 | #ifdef __KERNEL__ | ||
| 15 | # include <linux/in.h> | 14 | # include <linux/in.h> |
| 16 | #endif | 15 | #endif |
| 17 | #include <linux/posix_types.h> | 16 | #include <linux/posix_types.h> |