diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 07:02:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 07:02:35 -0400 |
| commit | 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c (patch) | |
| tree | e9684c84f53272319a5acd4b9c86503f30274a51 /include/linux/ivtvfb.h | |
| parent | 11c231a962c740b3216eb6565149ae5a7944cba7 (diff) | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/ivtvfb.h')
| -rw-r--r-- | include/linux/ivtvfb.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h index e980ba62ddcc..e20af47b59ad 100644 --- a/include/linux/ivtvfb.h +++ b/include/linux/ivtvfb.h | |||
| @@ -21,11 +21,7 @@ | |||
| 21 | #ifndef __LINUX_IVTVFB_H__ | 21 | #ifndef __LINUX_IVTVFB_H__ |
| 22 | #define __LINUX_IVTVFB_H__ | 22 | #define __LINUX_IVTVFB_H__ |
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | 24 | #include <linux/compiler.h> |
| 25 | #include <linux/compiler.h> /* need __user */ | ||
| 26 | #else | ||
| 27 | #define __user | ||
| 28 | #endif | ||
| 29 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 30 | 26 | ||
| 31 | /* Framebuffer external API */ | 27 | /* Framebuffer external API */ |