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>

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index cf4c1889083d5e0389bfb7a0ff6fe1aa15644740..35f7b2a485e1aecd75853b1ed2e4128ddb9ae329 100644 (file)
--- 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 185955a693b027207f66d97846068abd62f198cc..5c76ee7b106676ca953cf6b617413b5c3719af7b 100644 (file)
--- 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;
                }