diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-29 23:14:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:41:20 -0700 |
| commit | 87c8b8b3466b7e5977701b59dc92a1b9537a46e0 (patch) | |
| tree | 4b815ea03b369c85c4298fbfca0c56b89acaff9a /drivers/staging/xgifb/XGI_main_26.c | |
| parent | 20fc30b9412013f96005e5d8de6af6c555d6650f (diff) | |
| download | op-kernel-dev-87c8b8b3466b7e5977701b59dc92a1b9537a46e0.zip op-kernel-dev-87c8b8b3466b7e5977701b59dc92a1b9537a46e0.tar.gz | |
staging: xgifb: delete "off" option handling
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>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index ceb0883..4427745 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -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) |
