diff options
| author | Stefano Babic <[email protected]> | 2015-07-17 11:22:56 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2015-07-17 11:22:56 +0200 |
| commit | f448c5d3200372fa73f340144d013fdecf4e2f1f (patch) | |
| tree | b17b66f67a22b553f66bcb22e69d62cb2a5bbe7e /include/vbe.h | |
| parent | 425640256a7c5e9259f7583ee4eca1f3b70f8032 (diff) | |
| parent | 605e15db2b54302364a2528d3c6604fbc57be846 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
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 c5deee9eca9..1a86db886ad 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; |