summaryrefslogtreecommitdiff
path: root/include/asm-generic/statfs.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-27 17:19:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-27 17:19:16 -0700
commita83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch)
tree5b5c7c3a56898485479291b7c964a1f3887d469c /include/asm-generic/statfs.h
parentf9384d41c02408dd404aa64d66d0ef38adcf6479 (diff)
parent0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/asm-generic/statfs.h')
-rw-r--r--include/asm-generic/statfs.h5
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 @@
#ifndef _GENERIC_STATFS_H
#define _GENERIC_STATFS_H
-#ifndef __KERNEL_STRICT_NAMES
-# include <linux/types.h>
+#include <linux/types.h>
+
+#ifdef __KERNEL__
typedef __kernel_fsid_t fsid_t;
#endif