aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-08-19 22:40:27 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-23 14:24:26 -0700
commitde351ba690422fbee2a8c01031ef0eb6fd75cfc0 (patch)
tree5c21395e7a963530e831a041464b658c9ad70dce
parentstaging: xgifb: probe: delete checks for mode "none" (diff)
downloadlinux-dev-de351ba690422fbee2a8c01031ef0eb6fd75cfc0.tar.xz
linux-dev-de351ba690422fbee2a8c01031ef0eb6fd75cfc0.zip
staging: xgifb: replace video_type with FB_TYPE_PACKED_PIXELS
Replace a global variable with a constant. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/xgifb/XGI_main.h3
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 44b7adc672c6..39893ca78143 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -132,9 +132,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
/* Fbcon variables */
static struct fb_info *fb_info;
-
-static int video_type = FB_TYPE_PACKED_PIXELS;
-
static struct fb_var_screeninfo default_var = {
.xres = 0,
.yres = 0,
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 630f447b461b..4415d4aedbec 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1487,7 +1487,7 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
fix->smem_len = xgi_video_info.video_size;
- fix->type = video_type;
+ fix->type = FB_TYPE_PACKED_PIXELS;
fix->type_aux = 0;
if (xgi_video_info.video_bpp == 8)
fix->visual = FB_VISUAL_PSEUDOCOLOR;