diff options
| author | Kirill A. Shutemov <kirill@shutemov.name> | 2008-09-23 17:25:04 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-08 20:22:50 -0700 |
| commit | 6d859b16f920fc0369dc900a08f0208fa7ecef36 (patch) | |
| tree | a04e7573dab4ad9dec7d140bb2503c98ff24d1d1 | |
| parent | ff1301544d010243e577f7652a451e0901de1322 (diff) | |
| download | lwn-6d859b16f920fc0369dc900a08f0208fa7ecef36.tar.gz lwn-6d859b16f920fc0369dc900a08f0208fa7ecef36.zip | |
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>
| -rw-r--r-- | include/linux/smb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/smb.h b/include/linux/smb.h index caa43b2370cb..82fefddc5987 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, |