diff options
| author | Aaro Koskinen | 2011-08-31 20:46:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-09-06 20:42:09 +0200 |
| commit | 800d67cf9f77b2994521794f980fac798a1c13d8 (patch) | |
| tree | 59ba231b156d2f87bdfc0d023b268a0b577373bc /drivers/staging/xgifb | |
| parent | staging: xgifb: delete commented-out routines (diff) | |
| download | kernel-qcow2-linux-800d67cf9f77b2994521794f980fac798a1c13d8.tar.gz kernel-qcow2-linux-800d67cf9f77b2994521794f980fac798a1c13d8.tar.xz kernel-qcow2-linux-800d67cf9f77b2994521794f980fac798a1c13d8.zip | |
staging: xgifb: eliminate #ifdef Tap4
Eliminate #define Tap4 and related checks.
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 | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index aaa5fa0d27b7..040c9bf6d45c 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -5688,10 +5688,6 @@ static void XGI_SetTap4Regs(struct vb_device_info *pVBInfo) if (!(pVBInfo->VBType & VB_XGI301C)) return; -#ifndef Tap4 - xgifb_reg_and(pVBInfo->Part2Port, 0x4E, 0xEB); /* Disable Tap4 */ -#else /* Tap4 Setting */ - Tap4TimingPtr = XGI_GetTap4Ptr(0, pVBInfo); /* Set Horizontal Scaling */ for (i = 0x80, j = 0; i <= 0xBF; i++, j++) xgifb_reg_set(pVBInfo->Part2Port, i, Tap4TimingPtr->Reg[j]); @@ -5713,7 +5709,6 @@ static void XGI_SetTap4Regs(struct vb_device_info *pVBInfo) else /* Enable H.Scaling */ xgifb_reg_and_or(pVBInfo->Part2Port, 0x4E, ~0x14, 0x10); -#endif } static void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index e5e19ec950ef..770f859a6a99 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -1,5 +1,3 @@ -#define Tap4 - /* yilin modify for xgi20 */ static struct XGI_MCLKDataStruct XGI340New_MCLKData[] = { {0x16, 0x01, 0x01, 166}, |