staging: xgifb: delete duplicated YFilter1 data

PAL-M and PAL-N "YFilter1" tables are identical. Replace as follows:

	PALMYFilter1	==> xgifb_palmn_yfilter1
	PALNYFilter1	==> xgifb_palmn_yfilter1

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

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 8544523d5e81d17221a41f5c4e55794ff1b9c6ce..aebdf05eb64f4e958d993395dae5a8b056ea754d 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -6983,11 +6983,8 @@ static void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex,
        case 0x02:
        case 0x05:
        case 0x0D:
-               filterPtr = PALMYFilter1;
-               break;
-
        case 0x03:
-               filterPtr = PALNYFilter1;
+               filterPtr = xgifb_palmn_yfilter1;
                break;
 
        case 0x08:

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 3a95e1c406753b4a72db074bc0a89916acdf812f..49d56da4c74b3e1b549750961301770440c6266d 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -3210,18 +3210,7 @@ static unsigned char PALYFilter1[] = {
        0xFC, 0xFB, 0x14, 0x2A  /* 6 : 800x gra. mode */
 };
 
-static unsigned char PALMYFilter1[] = {
-       0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */
-       0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */
-       0xEB, 0x04, 0x10, 0x18, /* 2 : 640x text mode */
-       0xF7, 0x06, 0x19, 0x14, /* 3 : 720x text mode */
-       0x00, 0xF4, 0x10, 0x38, /* 4 : 320x gra. mode */
-       0xEB, 0x04, 0x25, 0x18, /* 5 : 640x gra. mode */
-       0xEB, 0x15, 0x25, 0xF6, /* 6 : 800x gra. mode */
-       0xFF, 0xFF, 0xFF, 0xFF  /* End of Table */
-};
-
-static unsigned char PALNYFilter1[] = {
+static unsigned char xgifb_palmn_yfilter1[] = {
        0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */
        0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */
        0xEB, 0x04, 0x10, 0x18, /* 2 : 640x text mode */