From ac64fdf48810ec7f64da0902ff0872d5bce5eda0 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sat, 7 Apr 2012 01:13:59 +0300
Subject: staging: xgifb: delete MD_XGI300

Nobody cares about this bit.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 0e2a625..ad83cd6 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -79,8 +79,7 @@ static int XGIfb_tvplug = -1;
 /* TW: For ioctl XGIFB_GET_INFO */
 /* XGIfb_info XGIfbinfo; */
 
-#define MD_XGI300 1
-#define MD_XGI315 2
+#define MD_XGI315 1
 
 /* mode table */
 static const struct _XGIbios_mode {
@@ -99,72 +98,72 @@ static const struct _XGIbios_mode {
 	{ 0x5B, 0x0000, 0x0000,  320,  480, 16,
 	 MD_XGI315},  /* TW: FSTN */
 	{ 0x2E, 0x0101, 0x0101,  640,  480,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x44, 0x0111, 0x0111,  640,  480, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x62, 0x013a, 0x0112,  640,  480, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x31, 0x0000, 0x0000,  720,  480,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x33, 0x0000, 0x0000,  720,  480, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x35, 0x0000, 0x0000,  720,  480, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x32, 0x0000, 0x0000,  720,  576,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x34, 0x0000, 0x0000,  720,  576, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x36, 0x0000, 0x0000,  720,  576, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x36, 0x0000, 0x0000,  720,  576, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x70, 0x0000, 0x0000,  800,  480,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x7a, 0x0000, 0x0000,  800,  480, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x76, 0x0000, 0x0000,  800,  480, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x30, 0x0103, 0x0103,  800,  600,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 #define DEFAULT_MODE              17 /* index for 800x600x16 */
 	{ 0x47, 0x0114, 0x0114,  800,  600, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x63, 0x013b, 0x0115,  800,  600, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x71, 0x0000, 0x0000, 1024,  576,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x74, 0x0000, 0x0000, 1024,  576, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x77, 0x0000, 0x0000, 1024,  576, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x77, 0x0000, 0x0000, 1024,  576, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x20, 0x0000, 0x0000, 1024,  600,  8,
-	 MD_XGI300          },  /* TW: 300 series only */
+	 },
 	{ 0x21, 0x0000, 0x0000, 1024,  600, 16,
-	 MD_XGI300          },
+	 },
 	{ 0x22, 0x0000, 0x0000, 1024,  600, 32,
-	 MD_XGI300          },
+	 },
 	{ 0x38, 0x0105, 0x0105, 1024,  768,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x4A, 0x0117, 0x0117, 1024,  768, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x64, 0x013c, 0x0118, 1024,  768, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x64, 0x013c, 0x0118, 1024,  768, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x23, 0x0000, 0x0000, 1152,  768,  8,
-	 MD_XGI300          },  /* TW: 300 series only */
+	 },
 	{ 0x24, 0x0000, 0x0000, 1152,  768, 16,
-	 MD_XGI300          },
+	 },
 	{ 0x25, 0x0000, 0x0000, 1152,  768, 32,
-	 MD_XGI300          },
+	 },
 	{ 0x79, 0x0000, 0x0000, 1280,  720,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x75, 0x0000, 0x0000, 1280,  720, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x78, 0x0000, 0x0000, 1280,  720, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x23, 0x0000, 0x0000, 1280,  768,  8,
 	 MD_XGI315},  /* TW: 310/325 series only */
 	{ 0x24, 0x0000, 0x0000, 1280,  768, 16,
@@ -172,17 +171,17 @@ static const struct _XGIbios_mode {
 	{ 0x25, 0x0000, 0x0000, 1280,  768, 32,
 	 MD_XGI315},
 	{ 0x7C, 0x0000, 0x0000, 1280,  960,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x7D, 0x0000, 0x0000, 1280,  960, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x7E, 0x0000, 0x0000, 1280,  960, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x3A, 0x0107, 0x0107, 1280, 1024,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x4D, 0x011a, 0x011a, 1280, 1024, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x65, 0x013d, 0x011b, 1280, 1024, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x26, 0x0000, 0x0000, 1400, 1050,  8,
 	 MD_XGI315},  /* TW: 310/325 series only */
 	{ 0x27, 0x0000, 0x0000, 1400, 1050, 16,
@@ -190,17 +189,17 @@ static const struct _XGIbios_mode {
 	{ 0x28, 0x0000, 0x0000, 1400, 1050, 32,
 	 MD_XGI315},
 	{ 0x3C, 0x0130, 0x011c, 1600, 1200,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x3D, 0x0131, 0x011e, 1600, 1200, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x66, 0x013e, 0x011f, 1600, 1200, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x68, 0x013f, 0x0000, 1920, 1440,  8,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x69, 0x0140, 0x0000, 1920, 1440, 16,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x6B, 0x0141, 0x0000, 1920, 1440, 32,
-	 MD_XGI300|MD_XGI315},
+	 MD_XGI315},
 	{ 0x6c, 0x0000, 0x0000, 2048, 1536,  8,
 	 MD_XGI315},  /* TW: 310/325 series only */
 	{ 0x6d, 0x0000, 0x0000, 2048, 1536, 16,
-- 
cgit v0.10.2