Skip to content

Commit

Permalink
staging: xgifb: delete duplicated YFilter1 data
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 80f86f8 commit 2555e94
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
5 changes: 1 addition & 4 deletions drivers/staging/xgifb/vb_setmode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 1 addition & 12 deletions drivers/staging/xgifb/vb_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 2555e94

Please sign in to comment.