From acadbdb53e796ee05da3f6695a0a894dfa51e40c Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 11 Oct 2011 21:47:36 +0300 Subject: [PATCH] --- yaml --- r: 268810 b: refs/heads/master c: 3261f2a1716993c5d88ab767d36a14bbc30d3717 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 11 ----------- trunk/drivers/staging/xgifb/XGIfb.h | 3 --- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 223784445a09..07ac0f477b6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 624554dae32ac1e0a2a2117224c778cf238ee233 +refs/heads/master: 3261f2a1716993c5d88ab767d36a14bbc30d3717 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index dc6a9a8faf78..03b6f78a667d 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2204,17 +2204,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, if (xgifb_info->hasVB != HASVB_NONE) XGIfb_detect_VB(xgifb_info); - if (xgifb_info->disp_state & DISPTYPE_DISP2) { - if (XGIfb_crt1off) - xgifb_info->disp_state |= DISPMODE_SINGLE; - else - xgifb_info->disp_state |= (DISPMODE_MIRROR | - DISPTYPE_CRT1); - } else { - xgifb_info->disp_state = DISPMODE_SINGLE | - DISPTYPE_CRT1; - } - if (xgifb_info->disp_state & DISPTYPE_LCD) { if (!enable_dstn) { reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL); diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h index 7d2b970991b5..2f62d19d0e90 100644 --- a/trunk/drivers/staging/xgifb/XGIfb.h +++ b/trunk/drivers/staging/xgifb/XGIfb.h @@ -6,13 +6,10 @@ #include "vb_struct.h" #include "vgatypes.h" -#define DISPTYPE_CRT1 0x00000008L #define DISPTYPE_CRT2 0x00000004L #define DISPTYPE_LCD 0x00000002L #define DISPTYPE_TV 0x00000001L #define DISPTYPE_DISP2 (DISPTYPE_CRT2 | DISPTYPE_LCD | DISPTYPE_TV) -#define DISPMODE_SINGLE 0x00000020L -#define DISPMODE_MIRROR 0x00000010L #define HASVB_NONE 0x00 #define HASVB_301 0x01