aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/vb_util.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_util.c
parent784cfe1d07259ba7faaa4f64a8d59c56d7a55641 (diff)
downloadkernel_samsung_smdk4412-84c7603c3888da8ee69802ad4f4647f94d18e2c5.zip
kernel_samsung_smdk4412-84c7603c3888da8ee69802ad4f4647f94d18e2c5.tar.gz
kernel_samsung_smdk4412-84c7603c3888da8ee69802ad4f4647f94d18e2c5.tar.bz2
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_util.c')
-rw-r--r--drivers/staging/xgifb/vb_util.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c
index 4c8ec25..b9ccce0 100644
--- a/drivers/staging/xgifb/vb_util.c
+++ b/drivers/staging/xgifb/vb_util.c
@@ -9,18 +9,6 @@
#include <linux/types.h>
#endif
-
-
-#ifdef LINUX_XF86
-#include "xf86.h"
-#include "xf86PciInfo.h"
-#include "xgi.h"
-#include "xgi_regs.h"
-#endif
-
-
-
-
void XGINew_SetReg1( ULONG , USHORT , USHORT ) ;
void XGINew_SetReg2( ULONG , USHORT , USHORT ) ;
void XGINew_SetReg3( ULONG , USHORT ) ;
@@ -42,13 +30,8 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);
/* --------------------------------------------------------------------- */
void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
{
-#ifdef LINUX_XF86
- OutPortByte( ( PUCHAR )(ULONG)port , index ) ;
- OutPortByte( ( PUCHAR )(ULONG)port + 1 , data ) ;
-#else
OutPortByte( port , index ) ;
OutPortByte( port + 1 , data ) ;
-#endif
}
@@ -101,13 +84,8 @@ UCHAR XGINew_GetReg1( ULONG port , USHORT index )
{
UCHAR data ;
-#ifdef LINUX_XF86
- OutPortByte( ( PUCHAR )(ULONG)port , index ) ;
- data = InPortByte( ( PUCHAR )(ULONG)port + 1 ) ;
-#else
OutPortByte( port , index ) ;
data = InPortByte( port + 1 ) ;
-#endif
return( data ) ;
}