diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /include/linux/smb.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'include/linux/smb.h')
| -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, |