diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-31 18:56:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-31 18:56:23 -0500 |
| commit | 45c82b5a770be66845687a7d027c8b52946d59af (patch) | |
| tree | 9385e15d13409e39d6f43805f8e7fa20430ca57e /include/linux/nfsd | |
| parent | 1347e965f5bcfffe82e56d2903ea4f32babaff4e (diff) | |
| parent | 7cff3608d2553a045b676fa81b0cf54e4f2cc5ce (diff) | |
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (90 commits)
headers_check fix: x86, swab.h
headers_check fix: x86, sigcontext32.h
headers_check fix: x86, sigcontext.h
headers_check fix: x86, ptrace-abi.h
headers_check fix: x86, mtrr.h
headers_check fix: x86, mce.h
headers_check fix: x86, kvm.h
headers_check fix: x86, e820.h
headers_check fix: linux/rtnetlink.h
headers_check fix: linux/nubus.h
headers_check fix: video/uvesafb.h
headers_check fix: video/sisfb.h
headers_check fix: sound/hdsp.h
headers_check fix: mtd/inftl-user.h
headers_check fix: linux/virtio_net.h
headers_check fix: linux/virtio_console.h
headers_check fix: linux/virtio_blk.h
headers_check fix: linux/videodev.h
headers_check fix: linux/video_encoder.h
headers_check fix: linux/video_decoder.h
...
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/export.h | 3 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 3 | ||||
| -rw-r--r-- | include/linux/nfsd/syscall.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 5431512b2757..bcd0201589f8 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h | |||
| @@ -10,9 +10,8 @@ | |||
| 10 | #ifndef NFSD_EXPORT_H | 10 | #ifndef NFSD_EXPORT_H |
| 11 | #define NFSD_EXPORT_H | 11 | #define NFSD_EXPORT_H |
| 12 | 12 | ||
| 13 | #include <asm/types.h> | ||
| 14 | #ifdef __KERNEL__ | ||
| 15 | # include <linux/types.h> | 13 | # include <linux/types.h> |
| 14 | #ifdef __KERNEL__ | ||
| 16 | # include <linux/in.h> | 15 | # include <linux/in.h> |
| 17 | #endif | 16 | #endif |
| 18 | 17 | ||
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index b2e093870bc6..fa317f6c154b 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
| @@ -14,9 +14,8 @@ | |||
| 14 | #ifndef _LINUX_NFSD_FH_H | 14 | #ifndef _LINUX_NFSD_FH_H |
| 15 | #define _LINUX_NFSD_FH_H | 15 | #define _LINUX_NFSD_FH_H |
| 16 | 16 | ||
| 17 | #include <asm/types.h> | ||
| 18 | #ifdef __KERNEL__ | ||
| 19 | # include <linux/types.h> | 17 | # include <linux/types.h> |
| 18 | #ifdef __KERNEL__ | ||
| 20 | # include <linux/string.h> | 19 | # include <linux/string.h> |
| 21 | # include <linux/fs.h> | 20 | # include <linux/fs.h> |
| 22 | #endif | 21 | #endif |
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> |