---

yaml --- r: 268792 b: refs/heads/master c: ab886ff h: refs/heads/master v: v3
git-mirror · Oct 12, 2011 · 5245ca2 · 5245ca2
1 parent d5a71bd
commit 5245ca2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7548a83e5f8885679fa568e55242500b6164ee2e
+refs/heads/master: ab886ff86dbcae6f5006900bafaf6102ff4bd79b
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -142,7 +142,7 @@ static inline void dumpVGAReg(void)
 #endif
 
 /* data for XGI components */
-struct video_info xgi_video_info;
+struct xgifb_video_info xgi_video_info;
 
 #if 1
 #define DEBUGPRN(x)
@@ -2412,7 +2412,7 @@ static int __devinit xgifb_probe(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;
 
 	unregister_framebuffer(fb_info);

diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h
@@ -54,7 +54,7 @@ enum xgi_tv_plug { /* vicki@030226 */
 	TVPLUG_TOTAL
 };
 
-struct video_info {
+struct xgifb_video_info {
 	struct fb_info *fb_info;
 	struct xgi_hw_device_info hw_info;
 
@@ -102,6 +102,6 @@ struct video_info {
 };
 
 
-extern struct video_info xgi_video_info;
+extern struct xgifb_video_info xgi_video_info;
 
 #endif
diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
@@ -1431,7 +1431,7 @@ static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo)
 
 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 vb_device_info VBINF;
 	struct vb_device_info *pVBInfo = &VBINF;