diff options
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 4 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_init.c | 2 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vgatypes.h | 11 |
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index faea2e7..5139204 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2994,7 +2994,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) strcpy(XGIhw_ext.szVBIOSVer, "0.84"); - XGIhw_ext.pSR = vmalloc(sizeof(XGI_DSReg) * SR_BUFFER_SIZE); + XGIhw_ext.pSR = vmalloc(sizeof(struct XGI_DSReg) * SR_BUFFER_SIZE); if (XGIhw_ext.pSR == NULL) { printk(KERN_ERR "XGIfb: Fatal error: Allocating SRReg space failed.\n"); @@ -3002,7 +3002,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } XGIhw_ext.pSR[0].jIdx = XGIhw_ext.pSR[0].jVal = 0xFF; - XGIhw_ext.pCR = vmalloc(sizeof(XGI_DSReg) * CR_BUFFER_SIZE); + XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE); if (XGIhw_ext.pCR == NULL) { vfree(XGIhw_ext.pSR); diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 343be25..06e229c 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -129,7 +129,7 @@ unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension) /* unsigned long j, k ; */ - PXGI_DSReg pSR ; + struct XGI_DSReg *pSR ; unsigned long Temp ; diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index c7d4eaf..bf9058d 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h @@ -52,13 +52,12 @@ enum XGI_LCD_TYPE { }; #endif -#ifndef PXGI_DSReg -typedef struct _XGI_DSReg +struct XGI_DSReg { unsigned char jIdx; unsigned char jVal; -} XGI_DSReg, *PXGI_DSReg; -#endif +}; + #ifndef XGI_HW_DEVICE_INFO @@ -116,12 +115,12 @@ struct _XGI_HW_DEVICE_INFO unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management, otherwise by 2nd adapter's initialzation */ - PXGI_DSReg pSR; /* restore SR registers in initial function. */ + struct XGI_DSReg *pSR; /* restore SR registers in initial function. */ /* end data :(idx, val) = (FF, FF). */ /* Note : restore SR registers if */ /* bSkipDramSizing = 1 */ - PXGI_DSReg pCR; /* restore CR registers in initial function. */ + struct XGI_DSReg *pCR; /* restore CR registers in initial function. */ /* end data :(idx, val) = (FF, FF) */ /* Note : restore cR registers if */ /* bSkipDramSizing = 1 */ |