diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 12:31:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 12:31:54 -0500 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /include/video/uvesafb.h | |
| parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
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; |