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/vgatypes.h | |
| 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/vgatypes.h')
| -rw-r--r-- | drivers/staging/xgifb/vgatypes.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index 256ef26..745c993 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h @@ -4,10 +4,7 @@ #include "osdef.h" - -#ifdef LINUX_KERNEL /* We don't want the X driver to depend on kernel source */ #include <linux/ioctl.h> -#endif #ifndef FALSE #define FALSE 0 @@ -73,45 +70,13 @@ typedef UCHAR BOOLEAN; typedef UCHAR bool; #endif */ -#ifdef LINUX_KERNEL typedef unsigned long XGIIOADDRESS; -#endif #ifndef VBIOS_VER_MAX_LENGTH #define VBIOS_VER_MAX_LENGTH 4 #endif -#ifndef LINUX_KERNEL /* For the linux kernel, this is defined in xgifb.h */ -#ifndef XGI_CHIP_TYPE -typedef enum _XGI_CHIP_TYPE { - XGI_VGALegacy = 0, - XGI_300, - XGI_630, - XGI_640, - XGI_315H, - XGI_315, - XGI_315PRO, - XGI_550, - XGI_650, - XGI_650M, - XGI_740, - XGI_330, - XGI_661, - XGI_660, - XGI_760, - XG40 = 32, - XG41, - XG42, - XG45, - XG20 = 48, - XG21, - XG27, - MAX_XGI_CHIP -} XGI_CHIP_TYPE; -#endif -#endif - #ifndef XGI_VB_CHIP_TYPE typedef enum _XGI_VB_CHIP_TYPE { VB_CHIP_Legacy = 0, |