diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 13:10:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:20:44 -0700 |
| commit | f2f58e14efe5d1de1003a05fbdb82a66fc22dfb8 (patch) | |
| tree | 9a12229935a4a9eb5f7e22a119d4b184b4859f92 /drivers/staging/xgifb/vb_init.c | |
| parent | 84c7603c3888da8ee69802ad4f4647f94d18e2c5 (diff) | |
| download | kernel_samsung_smdk4412-f2f58e14efe5d1de1003a05fbdb82a66fc22dfb8.zip kernel_samsung_smdk4412-f2f58e14efe5d1de1003a05fbdb82a66fc22dfb8.tar.gz kernel_samsung_smdk4412-f2f58e14efe5d1de1003a05fbdb82a66fc22dfb8.tar.bz2 | |
Staging: xgifb: Remove use of LINUX_KERNEL 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 | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index d3201d2..94fa48b 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -1,19 +1,10 @@ #include "osdef.h" #include "vgatypes.h" - -#ifdef LINUX_KERNEL #include <linux/version.h> #include <linux/types.h> #include <linux/delay.h> /* udelay */ #include "XGIfb.h" -/*#if LINUX_VERSxION_CODE >= KERNEL_VERSION(2,5,0) -#include <video/XGIfb.h> -#else -#include <linux/XGIfb.h> -#endif */ -#endif - #include "vb_def.h" #include "vb_struct.h" @@ -23,9 +14,7 @@ #include "vb_ext.h" -#ifdef LINUX_KERNEL #include <asm/io.h> -#endif @@ -120,13 +109,11 @@ UCHAR GetXG21FPBits(PVB_DEVICE_INFO pVBInfo); void XGINew_GetXG27Sense(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; UCHAR GetXG27FPBits(PVB_DEVICE_INFO pVBInfo); - -#ifdef LINUX_KERNEL void DelayUS(ULONG MicroSeconds) { udelay(MicroSeconds); } -#endif + /* --------------------------------------------------------------------- */ /* Function : XGIInitNew */ @@ -2667,8 +2654,6 @@ void SetPowerConsume ( PXGI_HW_DEVICE_INFO HwDeviceExtension , ULONG XGI_P3d4Por } - -#if defined(LINUX_KERNEL) void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) { @@ -2711,7 +2696,6 @@ void XGINew_InitVBIOSData(PXGI_HW_DEVICE_INFO HwDeviceExtension, PVB_DEVICE_INFO } } -#endif /* For Linux */ /* --------------------------------------------------------------------- */ /* Function : ReadVBIOSTablData */ |