From: Kirill A. Shutemov <kirill@shutemov.name>
Date: Mon, 22 Sep 2008 20:57:43 +0000 (-0700)
Subject: smb.h: do not include linux/time.h in userspace
X-Git-Tag: v2.6.27-rc8~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c32a162fd420fe8dfb049db941b2438061047fcc;p=linux-2.6-omap-h63xx.git

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 76308da (" 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>
---

diff --git a/include/linux/smb.h b/include/linux/smb.h
index caa43b2370c..82fefddc598 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,