From 88edfbc5f6c3e159da5cd02e622a599a43c51d52 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 6 Mar 2008 10:56:45 +0100
Subject: [PATCH] --- yaml --- r: 87028 b: refs/heads/master c:
 1722770f131bb5c8e238825f3eba2efa331483a2 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/boot/vesa.h       | 9 +--------
 trunk/arch/x86/boot/video-vesa.c | 2 --
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8706731f53c2..68553b62dabc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7432d149fda8ce9ead9df91e577b83ce52ad5f65
+refs/heads/master: 1722770f131bb5c8e238825f3eba2efa331483a2
diff --git a/trunk/arch/x86/boot/vesa.h b/trunk/arch/x86/boot/vesa.h
index ff5b73cd406f..468e444622c5 100644
--- a/trunk/arch/x86/boot/vesa.h
+++ b/trunk/arch/x86/boot/vesa.h
@@ -26,17 +26,10 @@ struct vesa_general_info {
 	far_ptr video_mode_ptr;	/* 14 */
 	u16 total_memory;	/* 18 */
 
-	u16 oem_software_rev;	/* 20 */
-	far_ptr oem_vendor_name_ptr;	/* 22 */
-	far_ptr oem_product_name_ptr;	/* 26 */
-	far_ptr oem_product_rev_ptr;	/* 30 */
-
-	u8 reserved[222];	/* 34 */
-	u8 oem_data[256];	/* 256 */
+	u8 reserved[236];	/* 20 */
 } __attribute__ ((packed));
 
 #define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24))
-#define VBE2_MAGIC ('V' + ('B' << 8) + ('E' << 16) + ('2' << 24))
 
 struct vesa_mode_info {
 	u16 mode_attr;		/* 0 */
diff --git a/trunk/arch/x86/boot/video-vesa.c b/trunk/arch/x86/boot/video-vesa.c
index 662dd2f13068..419b5c273374 100644
--- a/trunk/arch/x86/boot/video-vesa.c
+++ b/trunk/arch/x86/boot/video-vesa.c
@@ -37,8 +37,6 @@ static int vesa_probe(void)
 
 	video_vesa.modes = GET_HEAP(struct mode_info, 0);
 
-	vginfo.signature = VBE2_MAGIC;
-
 	ax = 0x4f00;
 	di = (size_t)&vginfo;
 	asm(INT10