diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2012-01-15 14:34:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-09 12:21:55 -0500 |
commit | e24b0a3f0c9ab95a7910458f3b4d90fdf19954e2 (patch) | |
tree | d5264a9fa484c5961d45f799489916d61b83b0b6 | |
parent | e3b09e4bf6455caccc7ef215256e4f0065fbca7d (diff) |
staging/xgifb: Remove unsupported mode LCD_320x480
This patch removes the probed mode LCD_320x480 which isn't supported
anyway since this mode falls through to the default (=invalid) mode in
the
XGIfb_validate_mode function (see line 529 ff. for details. the
commented out code for this mode is also removed).
By removing this assignment, we can use the LCD_TYPEs from the sis
driver without modifications.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 2502c49c9c5..e618aa6d63b 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c | |||
@@ -526,12 +526,6 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex) | |||
526 | xres = 1600; | 526 | xres = 1600; |
527 | yres = 1200; | 527 | yres = 1200; |
528 | break; | 528 | break; |
529 | /* case LCD_320x480: */ /* TW: FSTN */ | ||
530 | /* | ||
531 | xres = 320; | ||
532 | yres = 480; | ||
533 | break; | ||
534 | */ | ||
535 | default: | 529 | default: |
536 | xres = 0; | 530 | xres = 0; |
537 | yres = 0; | 531 | yres = 0; |
@@ -2117,10 +2111,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, | |||
2117 | reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL); | 2111 | reg = xgifb_reg_get(XGICR, IND_XGI_LCD_PANEL); |
2118 | reg &= 0x0f; | 2112 | reg &= 0x0f; |
2119 | hw_info->ulCRT2LCDType = XGI310paneltype[reg]; | 2113 | hw_info->ulCRT2LCDType = XGI310paneltype[reg]; |
2120 | |||
2121 | } else { | ||
2122 | /* TW: FSTN/DSTN */ | ||
2123 | hw_info->ulCRT2LCDType = LCD_320x480; | ||
2124 | } | 2114 | } |
2125 | } | 2115 | } |
2126 | 2116 | ||