diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/asm-generic/statfs.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
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 6129d6802149..3b4fb3e52f0d 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 | ||