diff --git a/[refs] b/[refs] index 0f6294314ef7..8cb959f52b5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f5042dfb4eedd11d5fbe10dda4605fe8d7890c1 +refs/heads/master: 20fc30b9412013f96005e5d8de6af6c555d6650f diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index eca5ed74feb5..ceb0883ebf05 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -1954,11 +1954,6 @@ static int __init XGIfb_setup(char *options) } else if (!strncmp(this_opt, "vesa:", 5)) { XGIfb_search_vesamode(simple_strtoul( this_opt + 5, NULL, 0)); - } else if (!strncmp(this_opt, "mode:", 5)) { - XGIfb_search_mode(this_opt + 5); - } else if (!strncmp(this_opt, "vesa:", 5)) { - XGIfb_search_vesamode(simple_strtoul( - this_opt + 5, NULL, 0)); } else if (!strncmp(this_opt, "vrate:", 6)) { xgi_video_info.refresh_rate = simple_strtoul( this_opt + 6, NULL, 0);