diff options
| author | Aaro Koskinen | 2011-10-11 20:47:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-10-12 17:51:45 +0200 |
| commit | ab886ff86dbcae6f5006900bafaf6102ff4bd79b (patch) | |
| tree | d14c3ed3c427b9ca40b5e1eba03353eb1d0d23c7 /drivers/staging/xgifb | |
| parent | staging: xgifb: add a global variable for the default refresh rate (diff) | |
| download | kernel-qcow2-linux-ab886ff86dbcae6f5006900bafaf6102ff4bd79b.tar.gz kernel-qcow2-linux-ab886ff86dbcae6f5006900bafaf6102ff4bd79b.tar.xz kernel-qcow2-linux-ab886ff86dbcae6f5006900bafaf6102ff4bd79b.zip | |
staging: xgifb: rename struct video_info to xgifb_video_info
Rename struct video_info to xgifb_video_info.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 4 | ||||
| -rw-r--r-- | drivers/staging/xgifb/XGIfb.h | 4 | ||||
| -rw-r--r-- | 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 f0f4746bf174..ef9b969aac3d 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 9b5552ba441a..0beda4268848 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 b6178b498e2e..ac36191dbffc 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; |