Merge branch 'bugzilla-10503' into test

[linux-2.6-omap-h63xx.git] / include / linux / smb.h

diff --git a/include/linux/smb.h b/include/linux/smb.h
index 6df3b1501559aadda5c5c926bc836431a1e0565a..82fefddc5987d0fba7925c76a14f2ac52dd82caf 100644 (file)
--- a/include/linux/smb.h
+++ b/include/linux/smb.h
@@ -11,6 +11,9 @@
 
 #include <linux/types.h>
 #include <linux/magic.h>
+#ifdef __KERNEL__
+#include <linux/time.h>
+#endif
 
 enum smb_protocol { 
        SMB_PROTOCOL_NONE, 
@@ -89,7 +92,6 @@ struct smb_fattr {
        struct timespec f_atime;
        struct timespec f_mtime;
        struct timespec f_ctime;
-       unsigned long   f_blksize;
        unsigned long   f_blocks;
        int             f_unix;
 };