Staging: xgifb: Remove unneeded XGI_LCD_TYPE enumeration.
authorMiguel Gómez <magomez@igalia.com>
Fri, 6 Jul 2012 10:40:37 +0000 (12:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Jul 2012 23:59:27 +0000 (16:59 -0700)
LCD_TYPEs are taken from drivers/video/sis/sis.h, so this enumeration is not
needed.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/vgatypes.h

index 7fc07194eea298095493329d3a7b873b1c008712..ddf7776c295b61ef885de62824c04ad244661e09 100644 (file)
@@ -21,40 +21,6 @@ enum XGI_VB_CHIP_TYPE {
 };
 #endif
 
-
-#define XGI_LCD_TYPE
-/* Since the merge with video/sis the LCD_TYPEs are used from
- drivers/video/sis/sis.h . Nevertheless we keep this (for the moment) for
- future reference until the code is merged completely and we are sure
- nothing of this should be added to the sis.h header */
-#ifndef XGI_LCD_TYPE
-enum XGI_LCD_TYPE {
-       LCD_INVALID = 0,
-       LCD_320x480,       /* FSTN, DSTN */
-       LCD_640x480,
-       LCD_640x480_2,     /* FSTN, DSTN */
-       LCD_640x480_3,     /* FSTN, DSTN */
-       LCD_800x600,
-       LCD_848x480,
-       LCD_1024x600,
-       LCD_1024x768,
-       LCD_1152x768,
-       LCD_1152x864,
-       LCD_1280x720,
-       LCD_1280x768,
-       LCD_1280x800,
-       LCD_1280x960,
-       LCD_1280x1024,
-       LCD_1400x1050,
-       LCD_1600x1200,
-       LCD_1680x1050,
-       LCD_1920x1440,
-       LCD_2048x1536,
-       LCD_CUSTOM,
-       LCD_UNKNOWN
-};
-#endif
-
 struct xgi_hw_device_info {
        unsigned long ulExternalChip; /* NO VB or other video bridge*/
                                      /* if ujVBChipID = VB_CHIP_UNKNOWN, */