Commit c32a162f authored Sep 22, 2008 by Kirill A. Shutemov Committed by Linus Torvalds Sep 23, 2008

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: Kirill A. Shutemov <kirill@shutemov.name>
Cc: <stable@kernel.org>             [2.6.26.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 683f40d7

include/linux/smb.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,