Commit c32a162f authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds

smb.h: do not include linux/time.h in userspace

linux/time.h conflicts with time.h from glibc

It breaks building smbmount from samba.  It's regression introduced by
commit 76308da1 (" smb.h: uses struct timespec but didn't include
linux/time.h").
Signed-off-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
Cc: <stable@kernel.org>             [2.6.26.x]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 683f40d7
......@@ -11,7 +11,9 @@
#include <linux/types.h>
#include <linux/magic.h>
#ifdef __KERNEL__
#include <linux/time.h>
#endif
enum smb_protocol {
SMB_PROTOCOL_NONE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment