OSDN Git Service

staging: xgifb: delete "userom" option
authorAaro Koskinen <aaro.koskinen@iki.fi>
Mon, 5 Dec 2011 22:10:47 +0000 (00:10 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 8 Dec 2011 20:26:08 +0000 (12:26 -0800)
Delete a redundant option.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/xgifb/XGI_main.h
drivers/staging/xgifb/XGI_main_26.c

index cf4c188..35f7b2a 100644 (file)
@@ -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;
index 185955a..5c76ee7 100644 (file)
@@ -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;
                }