git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[sfrench/cifs-2.6.git]
/
include
/
asm-generic
/
statfs.h
diff --git
a/include/asm-generic/statfs.h
b/include/asm-generic/statfs.h
index 6129d6802149f89e269f957fa62e181d819fac60..3b4fb3e52f0d280088efb42b0c32f5db6534be7b 100644
(file)
--- 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