leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: xgifb: delete "off" option handling

Browse Source 
It's possible to disable the built-in xgifb driver with the kernel
command line option:

	video=xgifb:off

This is already handled by the generic framebuffer layer (fb_get_options()
will return TRUE resulting in init failure), so no need to process the
option in the driver.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-08-29 23:14:20 +03:00 committed by Greg Kroah-Hartman
parent 20fc30b941
commit 87c8b8b346
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/xgifb/XGI_main.h
View File

@ -167,7 +167,6 @@ static u32 pseudo_palette[17];
/* display status */
static int XGIfb_off;
static int XGIfb_crt1off;
static int XGIfb_forcecrt1 = -1;
static int XGIfb_userom ;

5
drivers/staging/xgifb/XGI_main_26.c
View File

@ -1960,8 +1960,6 @@ static int __init XGIfb_setup(char *options)
} else if (!strncmp(this_opt, "rate:", 5)) {
xgi_video_info.refresh_rate = simple_strtoul(
this_opt + 5, NULL, 0);
} else if (!strncmp(this_opt, "off", 3)) {
XGIfb_off = 1;
} else if (!strncmp(this_opt, "crt1off", 7)) {
XGIfb_crt1off = 1;
} else if (!strncmp(this_opt, "filter:", 7)) {
@ -2023,9 +2021,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
u8 CR48, CR38;
int ret;
if (XGIfb_off)
return -ENXIO;
memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
if (!fb_info)