From: Kirill A. Shutemov <kirill@shutemov.name>
Date: Tue, 23 Sep 2008 17:25:04 +0000 (+0000)
Subject: smb.h: do not include linux/time.h in userspace
X-Git-Tag: v2.6.26.6~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d859b16f920fc0369dc900a08f0208fa7ecef36;p=thirdparty%2Fkernel%2Fstable.git

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

commit c32a162fd420fe8dfb049db941b2438061047fcc upstream

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

It breaks building smbmount from samba.  It's regression introduced by
commit 76308da (" smb.h: uses struct timespec but didn't include
linux/time.h").

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/include/linux/smb.h b/include/linux/smb.h
index caa43b2370cb0..82fefddc5987d 100644
--- a/include/linux/smb.h
+++ b/include/linux/smb.h
@@ -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,