Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs

[~andy/linux] / drivers / staging / xgifb / vb_struct.h

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index ae0c18b320a48cb97d4ae219a4d59cb7ceb22e38..c08ff5b2d6ee055dbca9092c9d6475bcb5375b6e 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -81,7 +81,6 @@ struct XGI_XG21CRT1Struct {
 struct XGI330_LCDCapStruct {
        unsigned char   LCD_ID;
        unsigned short  LCD_Capability;
-       unsigned char   LCD_SetFlag;
        unsigned char   LCD_HSyncWidth;
        unsigned char   LCD_VSyncWidth;
        unsigned char   LCD_VCLK;
@@ -89,16 +88,6 @@ struct XGI330_LCDCapStruct {
        unsigned char   LCDA_VCLKData2;
        unsigned char   LCUCHAR_VCLKData1;
        unsigned char   LCUCHAR_VCLKData2;
-       unsigned char   PSC_S1;
-       unsigned char   PSC_S2;
-       unsigned char   PSC_S3;
-       unsigned char   PSC_S4;
-       unsigned char   PSC_S5;
-       unsigned char   PWD_2B;
-       unsigned char   PWD_2C;
-       unsigned char   PWD_2D;
-       unsigned char   PWD_2E;
-       unsigned char   PWD_2F;
        unsigned char   Spectrum_31;
        unsigned char   Spectrum_32;
        unsigned char   Spectrum_33;
@@ -145,7 +134,7 @@ struct vb_device_info {
        unsigned short   LCDHRS, LCDVRS, LCDHDES, LCDVDES;
 
        unsigned short   ModeType;
-       unsigned short   IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
+       unsigned short   IF_DEF_LVDS;
        unsigned short   IF_DEF_CRT2Monitor;
        unsigned short   IF_DEF_YPbPr;
        unsigned short   IF_DEF_HiVision;
@@ -157,12 +146,11 @@ struct vb_device_info {
 
        void __iomem *FBAddr;
 
-       unsigned char const (*SR15)[3];
+       unsigned char const *SR18;
        unsigned char const (*CR40)[3];
 
        struct SiS_MCLKData const *MCLKData;
 
-       unsigned char   *pXGINew_DRAMTypeDefinition;
        unsigned char   XGINew_CR97;
 
        struct XGI330_LCDCapStruct const *LCDCapList;