diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /include/video/uvesafb.h | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'include/video/uvesafb.h')
| -rw-r--r-- | include/video/uvesafb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h index 95bcef193954..0993a220a3e6 100644 --- a/include/video/uvesafb.h +++ b/include/video/uvesafb.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _UVESAFB_H | 1 | #ifndef _UVESAFB_H |
| 2 | #define _UVESAFB_H | 2 | #define _UVESAFB_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 4 | struct v86_regs { | 6 | struct v86_regs { |
| 5 | __u32 ebx; | 7 | __u32 ebx; |
| 6 | __u32 ecx; | 8 | __u32 ecx; |