summaryrefslogtreecommitdiff
path: root/drivers/staging/xgifb/vb_setmode.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2010-06-17 13:10:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-22 14:20:37 -0700
commit84c7603c3888da8ee69802ad4f4647f94d18e2c5 (patch)
tree8d8bf8ac7a18b778e9c14bf5357d684d707e61ab /drivers/staging/xgifb/vb_setmode.c
parent784cfe1d07259ba7faaa4f64a8d59c56d7a55641 (diff)
Staging: xgifb: Remove use of LINUX_XF86 define
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/vb_setmode.c')
-rw-r--r--drivers/staging/xgifb/vb_setmode.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 9f5ce8c98c1e..5078788f48d0 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -2,12 +2,6 @@
-#ifdef LINUX_XF86
-#include "xf86.h"
-#include "xf86PciInfo.h"
-#include "xgi.h"
-#include "xgi_regs.h"
-#endif
#ifdef LINUX_KERNEL
#include <asm/io.h>
@@ -2609,9 +2603,7 @@ void XGI_ClearBuffer( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo, PVB
PVOID VideoMemoryAddress = ( PVOID )HwDeviceExtension->pjVideoMemoryAddress ;
ULONG AdapterMemorySize = ( ULONG )HwDeviceExtension->ulVideoMemorySize ;
PUSHORT pBuffer ;
-#ifndef LINUX_XF86
int i ;
-#endif
if ( pVBInfo->ModeType >= ModeEGA )
{
@@ -4901,10 +4893,7 @@ UCHAR XGI_GetVCLKPtr(USHORT RefreshRateTableIndex,USHORT ModeNo,USHORT ModeIdInd
USHORT index ,
modeflag ;
-#ifndef LINUX_XF86
USHORT tempbx ;
-#endif
-
UCHAR tempal ;
UCHAR *CHTVVCLKPtr = NULL ;