diff --git a/[refs] b/[refs] index 2d5139f03c52..a7b131e72669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69a186986111a31c0473971104e89c4975955e57 +refs/heads/master: 35c064da1b0c9525f51bb84e9ce55aa5961063f0 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 074fe4f9606e..34678a3b0fc2 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -460,12 +460,6 @@ static void XGIfb_search_mode(const char *name) if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) { printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n"); - xgifb_mode_idx = DEFAULT_MODE; - if ((xgi_video_info.chip == XG21) - && ((xgi_video_info.disp_state & DISPTYPE_DISP2) - == DISPTYPE_LCD)) { - xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx(); - } return; } @@ -489,12 +483,6 @@ static void XGIfb_search_vesamode(unsigned int vesamode) if (vesamode == 0) { printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n"); - xgifb_mode_idx = DEFAULT_MODE; - if ((xgi_video_info.chip == XG21) - && ((xgi_video_info.disp_state & DISPTYPE_DISP2) - == DISPTYPE_LCD)) { - xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx(); - } return; }