diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-10-11 18:47:36 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-12 15:51:49 (GMT) |
| commit | 3261f2a1716993c5d88ab767d36a14bbc30d3717 (patch) | |
| tree | b2bb5be08b3cb2d75083d68eba25ba83cc14e316 | |
| parent | 624554dae32ac1e0a2a2117224c778cf238ee233 (diff) | |
| download | linux-fsl-qoriq-3261f2a1716993c5d88ab767d36a14bbc30d3717.tar.xz | |
staging: xgifb: delete CRT1 state
The driver does not need to manage CRT1 state.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 11 | ||||
| -rw-r--r-- | drivers/staging/xgifb/XGIfb.h | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index dc6a9a8..03b6f78 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/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/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h index 7d2b970..2f62d19 100644 --- a/drivers/staging/xgifb/XGIfb.h +++ b/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 |