Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~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 9d1a0c724ce300e82992a86b48f16f98de3fbb7d..acf6e7fbbaed476493474b83b5ca4c4e79067953 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -158,19 +158,11 @@ struct vb_device_info {
        void __iomem *FBAddr;
        unsigned long BaseAddr;
 
-       unsigned char (*CR6B)[4];
+       unsigned char const (*SR15)[8];
+       unsigned char const (*CR40)[8];
 
-       unsigned char (*SR15)[8];
-       unsigned char (*CR40)[8];
+       struct SiS_MCLKData const *MCLKData;
 
-       unsigned char  *AGPReg;
-       unsigned char  *SR16;
-       unsigned char  SR21;
-       unsigned char  SR22;
-       unsigned char  SR25;
-       struct SiS_MCLKData  *MCLKData;
-
-       unsigned char   *ScreenOffset;
        unsigned char   *pXGINew_DRAMTypeDefinition;
        unsigned char   XGINew_CR97;
 
@@ -179,9 +171,6 @@ struct vb_device_info {
        struct XGI_TimingHStruct TimingH;
        struct XGI_TimingVStruct TimingV;
 
-       struct SiS_StResInfo_S   *StResInfo;
-       struct SiS_ModeResInfo_S *ModeResInfo;
-
        int ram_type;
        int ram_channel;
        int ram_bus;