From 80c0f0c4c0561dfb4e0c16c163a98d87b5fe9c28 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Tue, 15 Nov 2011 12:57:16 +0000 Subject: [PATCH] --- yaml --- r: 283533 b: refs/heads/master c: 0f7c5d477f2ce552997831d80e2c872cca1b9054 h: refs/heads/master i: 283531: 340bcf2127579624da626e3c21fae8f9fe46f309 v: v3 --- [refs] | 2 +- trunk/include/linux/efi.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5c12ac9a6c71..b183925eb1fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb05e4ba452ada7966fbced4e829aa029f546445 +refs/heads/master: 0f7c5d477f2ce552997831d80e2c872cca1b9054 diff --git a/trunk/include/linux/efi.h b/trunk/include/linux/efi.h index 378f2cd1f7c3..e46d771f87e5 100644 --- a/trunk/include/linux/efi.h +++ b/trunk/include/linux/efi.h @@ -298,6 +298,15 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules, #define LOADED_IMAGE_PROTOCOL_GUID \ EFI_GUID( 0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) +#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \ + EFI_GUID( 0x9042a9de, 0x23dc, 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a ) + +#define EFI_UGA_PROTOCOL_GUID \ + EFI_GUID( 0x982c298b, 0xf4fa, 0x41cb, 0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39 ) + +#define EFI_PCI_IO_PROTOCOL_GUID \ + EFI_GUID( 0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a ) + typedef struct { efi_guid_t guid; unsigned long table;