Commit ab886ff8 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: rename struct video_info to xgifb_video_info

Rename struct video_info to xgifb_video_info.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7548a83e
...@@ -142,7 +142,7 @@ static inline void dumpVGAReg(void) ...@@ -142,7 +142,7 @@ static inline void dumpVGAReg(void)
#endif #endif
/* data for XGI components */ /* data for XGI components */
struct video_info xgi_video_info; struct xgifb_video_info xgi_video_info;
#if 1 #if 1
#define DEBUGPRN(x) #define DEBUGPRN(x)
...@@ -2412,7 +2412,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, ...@@ -2412,7 +2412,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
static void __devexit xgifb_remove(struct pci_dev *pdev) static void __devexit xgifb_remove(struct pci_dev *pdev)
{ {
struct video_info *xgifb_info = pci_get_drvdata(pdev); struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
struct fb_info *fb_info = xgifb_info->fb_info; struct fb_info *fb_info = xgifb_info->fb_info;
unregister_framebuffer(fb_info); unregister_framebuffer(fb_info);
......
...@@ -54,7 +54,7 @@ enum xgi_tv_plug { /* vicki@030226 */ ...@@ -54,7 +54,7 @@ enum xgi_tv_plug { /* vicki@030226 */
TVPLUG_TOTAL TVPLUG_TOTAL
}; };
struct video_info { struct xgifb_video_info {
struct fb_info *fb_info; struct fb_info *fb_info;
struct xgi_hw_device_info hw_info; struct xgi_hw_device_info hw_info;
...@@ -102,6 +102,6 @@ struct video_info { ...@@ -102,6 +102,6 @@ struct video_info {
}; };
extern struct video_info xgi_video_info; extern struct xgifb_video_info xgi_video_info;
#endif #endif
...@@ -1431,7 +1431,7 @@ static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo) ...@@ -1431,7 +1431,7 @@ static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo)
unsigned char XGIInitNew(struct pci_dev *pdev) unsigned char XGIInitNew(struct pci_dev *pdev)
{ {
struct video_info *xgifb_info = pci_get_drvdata(pdev); struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
struct xgi_hw_device_info *HwDeviceExtension = &xgifb_info->hw_info; struct xgi_hw_device_info *HwDeviceExtension = &xgifb_info->hw_info;
struct vb_device_info VBINF; struct vb_device_info VBINF;
struct vb_device_info *pVBInfo = &VBINF; struct vb_device_info *pVBInfo = &VBINF;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment