From: Aaro Koskinen Date: Mon, 29 Aug 2011 20:14:20 +0000 (+0300) Subject: staging: xgifb: delete "off" option handling X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87c8b8b3466b7e5977701b59dc92a1b9537a46e0;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 08f62e1e2748..b65ed6e6b819 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -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 ; diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index ceb0883ebf05..442774508d2a 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)