diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-12-06 00:10:47 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-08 12:26:08 -0800 |
| commit | 776091018bf722eebc75c8be958bdd59f003e6f7 (patch) | |
| tree | 84a49f1ac279e4f1d73cc84e98ad89709adad64e /drivers/staging/xgifb | |
| parent | staging: xgifb: vb_table: delete XGI21_LCDCapList (diff) | |
| download | linux-dev-776091018bf722eebc75c8be958bdd59f003e6f7.tar.xz linux-dev-776091018bf722eebc75c8be958bdd59f003e6f7.zip | |
staging: xgifb: delete "userom" option
Delete a redundant option.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index cf4c1889083d..35f7b2a485e1 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -124,7 +124,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); /* display status */ static int XGIfb_crt1off; static int XGIfb_forcecrt1 = -1; -static int XGIfb_userom ; /* global flags */ static int XGIfb_tvmode; diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 185955a693b0..5c76ee7b1066 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1875,8 +1875,6 @@ static int __init XGIfb_setup(char *options) XGIfb_crt2type = XGIFB_DISP_LCD; } else if (!strncmp(this_opt, "noypan", 6)) { XGIfb_ypan = 0; - } else if (!strncmp(this_opt, "userom:", 7)) { - XGIfb_userom = xgifb_optval(this_opt, 7); } else { mode = this_opt; } |