diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-02 23:55:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-02 23:55:27 -0800 |
| commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
| tree | 607b09022b206a539cb4a924e4ef476443798252 /include/linux/nfsd/nfsfh.h | |
| parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
| download | talos-op-linux-fb53fde9762432d091dac209bdf4f3f850117c55.tar.gz talos-op-linux-fb53fde9762432d091dac209bdf4f3f850117c55.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/nfsd/nfsfh.h')
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ #ifndef _LINUX_NFSD_FH_H #define _LINUX_NFSD_FH_H -#include <asm/types.h> -#ifdef __KERNEL__ # include <linux/types.h> +#ifdef __KERNEL__ # include <linux/string.h> # include <linux/fs.h> #endif |
