diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-15 14:41:20 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-15 14:41:20 (GMT) |
| commit | 605e15db2b54302364a2528d3c6604fbc57be846 (patch) | |
| tree | 1a1e344964bff1719939183124d66a71e7ca7731 /include/vbe.h | |
| parent | 4905dfc65d9a17083727865302d2cf633c15c911 (diff) | |
| parent | f110da9984c0aa0aba9e1c4178b67b7abecf7e8d (diff) | |
| download | u-boot-605e15db2b54302364a2528d3c6604fbc57be846.tar.xz | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/vbe.h')
| -rw-r--r-- | include/vbe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vbe.h b/include/vbe.h index c5deee9..1a86db8 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -12,7 +12,7 @@ #define _VBE_H /* these structs are for input from and output to OF */ -struct __packed screen_info { +struct __packed vbe_screen_info { u8 display_type; /* 0=NONE, 1= analog, 2=digital */ u16 screen_width; u16 screen_height; @@ -23,7 +23,7 @@ struct __packed screen_info { u8 edid_block_zero[128]; }; -struct __packed screen_info_input { +struct __packed vbe_screen_info_input { u8 signature[4]; u16 size_reserved; u8 monitor_number; |