diff options
Diffstat (limited to 'drivers/video/sis/vstruct.h')
| -rw-r--r-- | drivers/video/sis/vstruct.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/video/sis/vstruct.h b/drivers/video/sis/vstruct.h index bef4aae388d0..ea94d214dcff 100644 --- a/drivers/video/sis/vstruct.h +++ b/drivers/video/sis/vstruct.h | |||
| @@ -233,24 +233,15 @@ struct SiS_Private | |||
| 233 | { | 233 | { |
| 234 | unsigned char ChipType; | 234 | unsigned char ChipType; |
| 235 | unsigned char ChipRevision; | 235 | unsigned char ChipRevision; |
| 236 | #ifdef SIS_XORG_XF86 | ||
| 237 | PCITAG PciTag; | ||
| 238 | #endif | ||
| 239 | #ifdef SIS_LINUX_KERNEL | ||
| 240 | void *ivideo; | 236 | void *ivideo; |
| 241 | #endif | ||
| 242 | unsigned char *VirtualRomBase; | 237 | unsigned char *VirtualRomBase; |
| 243 | bool UseROM; | 238 | bool UseROM; |
| 244 | #ifdef SIS_LINUX_KERNEL | ||
| 245 | unsigned char SISIOMEMTYPE *VideoMemoryAddress; | 239 | unsigned char SISIOMEMTYPE *VideoMemoryAddress; |
| 246 | unsigned int VideoMemorySize; | 240 | unsigned int VideoMemorySize; |
| 247 | #endif | ||
| 248 | SISIOADDRESS IOAddress; | 241 | SISIOADDRESS IOAddress; |
| 249 | SISIOADDRESS IOAddress2; /* For dual chip XGI volari */ | 242 | SISIOADDRESS IOAddress2; /* For dual chip XGI volari */ |
| 250 | 243 | ||
| 251 | #ifdef SIS_LINUX_KERNEL | ||
| 252 | SISIOADDRESS RelIO; | 244 | SISIOADDRESS RelIO; |
| 253 | #endif | ||
| 254 | SISIOADDRESS SiS_P3c4; | 245 | SISIOADDRESS SiS_P3c4; |
| 255 | SISIOADDRESS SiS_P3d4; | 246 | SISIOADDRESS SiS_P3d4; |
| 256 | SISIOADDRESS SiS_P3c0; | 247 | SISIOADDRESS SiS_P3c0; |
| @@ -280,9 +271,6 @@ struct SiS_Private | |||
| 280 | unsigned short SiS_IF_DEF_FSTN; | 271 | unsigned short SiS_IF_DEF_FSTN; |
| 281 | unsigned short SiS_SysFlags; | 272 | unsigned short SiS_SysFlags; |
| 282 | unsigned char SiS_VGAINFO; | 273 | unsigned char SiS_VGAINFO; |
| 283 | #ifdef SIS_XORG_XF86 | ||
| 284 | unsigned short SiS_CP1, SiS_CP2, SiS_CP3, SiS_CP4; | ||
| 285 | #endif | ||
| 286 | bool SiS_UseROM; | 274 | bool SiS_UseROM; |
| 287 | bool SiS_ROMNew; | 275 | bool SiS_ROMNew; |
| 288 | bool SiS_XGIROM; | 276 | bool SiS_XGIROM; |
