Rename struct video_info to xgifb_video_info.
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
---
drivers/staging/xgifb/XGI_main_26.c | 4 ++--
drivers/staging/xgifb/XGIfb.h | 4 ++--
drivers/staging/xgifb/vb_init.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index f0f4746..ef9b969 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/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 @@ error:
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/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 9b5552b..0beda42 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/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/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index b6178b4..ac36191 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/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;
--
1.7.2.5
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
