vserver 1.9.5.x5

[linux-2.6.git] / drivers / video / sis / vstruct.h

diff --git a/drivers/video/sis/vstruct.h b/drivers/video/sis/vstruct.h
index e3da799..d4d55c9 100644 (file)
--- a/drivers/video/sis/vstruct.h
+++ b/drivers/video/sis/vstruct.h
@@ -35,7 +35,7 @@
  * * 3) The name of the author may not be used to endorse or promote products
  * *    derived from this software without specific prior written permission.
  * *
- * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
+ * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
@@ -50,12 +50,6 @@
  *
  */
 
-#ifdef _INIT_
-#define EXTERN
-#else
-#define EXTERN extern
-#endif /* _INIT_ */
-
 #ifndef _VSTRUCT_
 #define _VSTRUCT_
 
@@ -286,7 +280,7 @@ typedef struct _SiS_Private
        USHORT SiS_IF_DEF_FSTN;
        USHORT SiS_SysFlags;
        UCHAR  SiS_VGAINFO;
-#ifndef LINUX_KERNEL
+#ifdef LINUX_XF86
         USHORT SiS_CP1, SiS_CP2, SiS_CP3, SiS_CP4;
 #endif
        BOOLEAN SiS_UseROM;
@@ -304,6 +298,7 @@ typedef struct _SiS_Private
        BOOLEAN HaveEMILCD;
        BOOLEAN OverruleEMI;
        UCHAR  EMI_30,EMI_31,EMI_32,EMI_33;
+       USHORT SiS_EMIOffset;
        SHORT  PDC, PDCA;
        UCHAR  SiS_MyCR63;
        USHORT SiS_CRT1Mode;
@@ -358,7 +353,7 @@ typedef struct _SiS_Private
        USHORT SiS_PanelMin301;
 
        const SiS_StStruct          *SiS_SModeIDTable;
-       SiS_StandTableStruct        *SiS_StandTable;
+       const SiS_StandTableStruct  *SiS_StandTable;
        const SiS_ExtStruct         *SiS_EModeIDTable;
        const SiS_Ext2Struct        *SiS_RefIndex;
        const SiS_VBModeStruct      *SiS_VBModeIDTable;
@@ -374,7 +369,7 @@ typedef struct _SiS_Private
        const UCHAR                 *pSiS_SoftSetting;
 
        const DRAM4Type *SiS_SR15; /* pointer : point to array */
-#ifndef LINUX_XF86
+#ifdef LINUX_KERNEL
        UCHAR *pSiS_SR07;
        const DRAM4Type *SiS_CR40; /* pointer : point to array */
        UCHAR *SiS_CR49;
@@ -420,8 +415,8 @@ typedef struct _SiS_Private
        const SiS_LCDDataStruct  *SiS_LCD1280x720Data;
        const SiS_LCDDataStruct  *SiS_StLCD1280x768_2Data;
        const SiS_LCDDataStruct  *SiS_ExtLCD1280x768_2Data;
-       const SiS_LCDDataStruct  *SiS_LCD1280x768_3Data;
        const SiS_LCDDataStruct  *SiS_LCD1280x800Data;
+       const SiS_LCDDataStruct  *SiS_LCD1280x800_2Data;
        const SiS_LCDDataStruct  *SiS_LCD1280x960Data;
        const SiS_LCDDataStruct  *SiS_ExtLCD1280x1024Data;
        const SiS_LCDDataStruct  *SiS_St2LCD1280x1024Data;
@@ -663,6 +658,8 @@ typedef struct _SiS_Private
        BOOLEAN CP_HaveCustomData;
        int     CP_PreferredX, CP_PreferredY, CP_PreferredIndex;
        int     CP_MaxX, CP_MaxY, CP_MaxClock;
+       UCHAR   CP_PrefSR2B, CP_PrefSR2C;
+       USHORT  CP_PrefClock;
        BOOLEAN CP_Supports64048075;
        int     CP_HDisplay[7], CP_VDisplay[7]; /* For Custom LCD panel dimensions */
        int     CP_HTotal[7], CP_VTotal[7];