diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 13:10:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:20:37 -0700 |
| commit | 84c7603c3888da8ee69802ad4f4647f94d18e2c5 (patch) | |
| tree | 8d8bf8ac7a18b778e9c14bf5357d684d707e61ab /drivers/staging/xgifb/vb_init.c | |
| parent | 784cfe1d07259ba7faaa4f64a8d59c56d7a55641 (diff) | |
| download | kernel_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_init.c')
| -rw-r--r-- | drivers/staging/xgifb/vb_init.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index dfa0473..d3201d2 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -22,12 +22,6 @@ #include "vb_init.h" #include "vb_ext.h" -#ifdef LINUX_XF86 -#include "xf86.h" -#include "xf86PciInfo.h" -#include "xgi.h" -#include "xgi_regs.h" -#endif #ifdef LINUX_KERNEL #include <asm/io.h> @@ -2674,7 +2668,7 @@ void SetPowerConsume ( PXGI_HW_DEVICE_INFO HwDeviceExtension , ULONG XGI_P3d4Por -#if defined(LINUX_XF86)||defined(LINUX_KERNEL) +#if defined(LINUX_KERNEL) void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { @@ -3103,9 +3097,8 @@ void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) /* void XGINew_SetDRAMModeRegister_XG27( PXGI_HW_DEVICE_INFO HwDeviceExtension ) { -#ifndef LINUX_XF86 + UCHAR data ; -#endif VB_DEVICE_INFO VBINF; PVB_DEVICE_INFO pVBInfo = &VBINF; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ; |