From d542af50cc78c6fe78543aecfc91737eeec3a7d5 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 18 Apr 2011 22:14:06 +0300 Subject: [PATCH] staging: xgifb: main: delete redudant extern declarations Delete redudant declarations and include proper .h files. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGI_main.h | 55 ----------------------------- drivers/staging/xgifb/XGI_main_26.c | 2 ++ 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 1b20e55318f1..4c480bc276c2 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -648,59 +648,4 @@ static const struct _XGI_TV_filter { static int filter = -1; static unsigned char filter_tb; - -/* ---------------------- Routine prototypes ------------------------- */ - -/* -extern int XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, - struct xgi_hw_device_info *HwDeviceExtension, - unsigned char modeno, unsigned char rateindex); -extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, - unsigned char modeno, unsigned char rateindex, - unsigned int *left_margin, unsigned int *right_margin, - unsigned int *upper_margin, unsigned int *lower_margin, - unsigned int *hsync_len, unsigned int *vsync_len, - unsigned int *sync, unsigned int *vmode); -*/ -extern unsigned char XGI_SearchModeID(unsigned short ModeNo, - unsigned short *ModeIdIndex, - struct vb_device_info *); - -/* Internal routines to access PCI configuration space */ -unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext, - unsigned long offset, - unsigned long set, - unsigned long *value); -//BOOLEAN XGIfb_query_north_bridge_space(PXGI_HW_DEVICE_INFO pXGIhw_ext, -// unsigned long offset, unsigned long set, unsigned long *value); - - -/* Routines from init.c/init301.c */ -extern void InitTo330Pointer(unsigned char, struct vb_device_info *pVBInfo); -extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension); -extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, - unsigned short ModeNo); -//extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr); -extern void XGI_LongWait(struct vb_device_info *XGI_Pr); -extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, - unsigned short ModeNo, - unsigned short ModeIdIndex, - struct vb_device_info *pVBInfo); -/* TW: Chrontel TV functions */ -extern unsigned short XGI_GetCH700x(struct vb_device_info *XGI_Pr, - unsigned short tempbx); -extern void XGI_SetCH700x(struct vb_device_info *XGI_Pr, unsigned short tempbx); -extern unsigned short XGI_GetCH701x(struct vb_device_info *XGI_Pr, - unsigned short tempbx); -extern void XGI_SetCH701x(struct vb_device_info *XGI_Pr, unsigned short tempbx); -extern void XGI_SetCH70xxANDOR(struct vb_device_info *XGI_Pr, - unsigned short tempax, - unsigned short tempbh); -extern void XGI_DDC2Delay(struct vb_device_info *XGI_Pr, unsigned short delaytime); - -/* TW: Sensing routines */ -void XGI_Sense30x(void); -int XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch); - -extern struct XGI21_LVDSCapStruct XGI21_LCDCapList[13]; #endif diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 135068162035..a6e9c60faf5a 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -41,7 +41,9 @@ #include "XGIfb.h" #include "vgatypes.h" #include "XGI_main.h" +#include "vb_init.h" #include "vb_util.h" +#include "vb_setmode.h" #define Index_CR_GPIO_Reg1 0x48 #define Index_CR_GPIO_Reg2 0x49 -- 2.34.1