diff options
| author | Kirill A. Shutemov <kirill@shutemov.name> | 2008-09-22 16:57:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 11:09:13 -0400 |
| commit | c32a162fd420fe8dfb049db941b2438061047fcc (patch) | |
| tree | bea33ba6fb2d63044b00e6603a226d8b65ce973b /include/linux | |
| parent | 683f40d7e7eee06811db43cb4c45349eab0d539e (diff) | |
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>
Diffstat (limited to 'include/linux')
| -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 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | #include <linux/magic.h> | 13 | #include <linux/magic.h> |
| 14 | #ifdef __KERNEL__ | ||
| 14 | #include <linux/time.h> | 15 | #include <linux/time.h> |
| 16 | #endif | ||
| 15 | 17 | ||
| 16 | enum smb_protocol { | 18 | enum smb_protocol { |
| 17 | SMB_PROTOCOL_NONE, | 19 | SMB_PROTOCOL_NONE, |