diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-31 21:46:06 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:42:11 -0700 |
| commit | 2555e9458fbdf00c02d6184fa1d2ea93f4651f46 (patch) | |
| tree | 80b2a9df38079de20cea0307a1adafbedd521074 /drivers/staging/xgifb | |
| parent | 80f86f8f2613370055b83e6bb5876caccab6d815 (diff) | |
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>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 5 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_table.h | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 8544523d5e81..aebdf05eb64f 100644 --- 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 3a95e1c40675..49d56da4c74b 100644 --- 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 */ |