Prev: [PATCH 0/6] [STAGING] More xgifb cleanup
Next: iwl6050 firmware?
From: Riccardo Magliocchetti on 5 Jun 2010 19:40
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti(a)gmail.com>
---
drivers/staging/xgifb/vb_struct.h | 9 ---------
drivers/staging/xgifb/vgatypes.h | 12 ------------
2 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index bb25c0e..1302d8f 100644
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -1,15 +1,6 @@
#ifndef _VB_STRUCT_
#define _VB_STRUCT_

-#ifdef _INITNEW_
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-
-
-
typedef struct _XGI_PanelDelayTblStruct
{
UCHAR timer[2];
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 7ca84fe..3df7a39 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -74,7 +74,6 @@ typedef unsigned long XGIIOADDRESS;
#define VBIOS_VER_MAX_LENGTH 4
#endif

-#ifndef XGI_VB_CHIP_TYPE
typedef enum _XGI_VB_CHIP_TYPE {
VB_CHIP_Legacy = 0,
VB_CHIP_301,
@@ -88,9 +87,7 @@ typedef enum _XGI_VB_CHIP_TYPE {
VB_CHIP_UNKNOWN, /* other video bridge or no video bridge */
MAX_VB_CHIP
} XGI_VB_CHIP_TYPE;
-#endif

-#ifndef XGI_LCD_TYPE
typedef enum _XGI_LCD_TYPE {
LCD_INVALID = 0,
LCD_320x480, /* FSTN, DSTN */
@@ -116,17 +113,12 @@ typedef enum _XGI_LCD_TYPE {
LCD_CUSTOM,
LCD_UNKNOWN
} XGI_LCD_TYPE;
-#endif

-#ifndef PXGI_DSReg
typedef struct _XGI_DSReg
{
UCHAR jIdx;
UCHAR jVal;
} XGI_DSReg, *PXGI_DSReg;
-#endif
-
-#ifndef XGI_HW_DEVICE_INFO

typedef struct _XGI_HW_DEVICE_INFO XGI_HW_DEVICE_INFO, *PXGI_HW_DEVICE_INFO;

@@ -194,9 +186,6 @@ struct _XGI_HW_DEVICE_INFO
/* end data :(idx, val) = (FF, FF) */
/* Note : restore cR registers if */
/* bSkipDramSizing = TRUE */
-/*
-#endif
-*/

PXGI_QUERYSPACE pQueryVGAConfigSpace;

@@ -205,7 +194,6 @@ struct _XGI_HW_DEVICE_INFO
UCHAR szVBIOSVer[VBIOS_VER_MAX_LENGTH];

};
-#endif

#endif

--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 0/6] [STAGING] More xgifb cleanup
Next: iwl6050 firmware?