From f7c1764bcead51d0725784a43ba7f04d2ec4879e Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 11 Oct 2011 21:47:29 +0300 Subject: [PATCH] --- yaml --- r: 268803 b: refs/heads/master c: 7d2ab0c62dd3eb283853340e8aab095bdb6f6ac7 h: refs/heads/master i: 268801: 48b869b7dafb4bac76c934d2ba0ecbc174673d1c 268799: e3ba49f2e81a50dea4e304f3917388401d5b587e v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c85ea4fe9ed5..144a580063fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84a6c46eb2d4aac843d6946bf8319dfe78a35f96 +refs/heads/master: 7d2ab0c62dd3eb283853340e8aab095bdb6f6ac7 diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h index 78f4c934b24f..6c1f5e0a1bfc 100644 --- a/trunk/drivers/staging/xgifb/XGI_main.h +++ b/trunk/drivers/staging/xgifb/XGI_main.h @@ -150,8 +150,7 @@ static struct vb_device_info XGI_Pr; #define MD_XGI315 2 /* mode table */ -/* NOT const - will be patched for 1280x960 mode number chaos reasons */ -static struct _XGIbios_mode { +static const struct _XGIbios_mode { char name[15]; u8 mode_no; u16 vesa_mode_no_1; /* "XGI defined" VESA mode number */ @@ -261,7 +260,7 @@ static struct _XGIbios_mode { {"1280x768x32", 0x25, 0x0000, 0x0000, 1280, 768, 32, 1, 160, 48, MD_XGI315}, {"1280x960x8", 0x7C, 0x0000, 0x0000, 1280, 960, 8, 1, 160, 60, - MD_XGI300|MD_XGI315}, /* TW: Modenumbers being patched */ + MD_XGI300|MD_XGI315}, {"1280x960x16", 0x7D, 0x0000, 0x0000, 1280, 960, 16, 1, 160, 60, MD_XGI300|MD_XGI315}, {"1280x960x24", 0x7E, 0x0000, 0x0000, 1280, 960, 32, 1, 160, 60,