diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /include/asm-generic/statfs.h | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-generic/statfs.h')
| -rw-r--r-- | include/asm-generic/statfs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-generic/statfs.h b/include/asm-generic/statfs.h index 6129d680214..3b4fb3e52f0 100644 --- a/include/asm-generic/statfs.h +++ b/include/asm-generic/statfs.h | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | #ifndef _GENERIC_STATFS_H | 1 | #ifndef _GENERIC_STATFS_H |
| 2 | #define _GENERIC_STATFS_H | 2 | #define _GENERIC_STATFS_H |
| 3 | 3 | ||
| 4 | #ifndef __KERNEL_STRICT_NAMES | 4 | #include <linux/types.h> |
| 5 | # include <linux/types.h> | 5 | |
| 6 | #ifdef __KERNEL__ | ||
| 6 | typedef __kernel_fsid_t fsid_t; | 7 | typedef __kernel_fsid_t fsid_t; |
| 7 | #endif | 8 | #endif |
| 8 | 9 | ||