diff options
| author | Aaro Koskinen | 2011-10-11 20:47:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-10-12 17:51:48 +0200 |
| commit | f2df8c097a3cf0436c22358e11033c2d3b320aa4 (patch) | |
| tree | 7cd2e96576637e611a2d281089dddf26de386e96 /drivers/staging/xgifb/XGI_main.h | |
| parent | staging: xgifb: make XGIbios_mode const (diff) | |
| download | kernel-qcow2-linux-f2df8c097a3cf0436c22358e11033c2d3b320aa4.tar.gz kernel-qcow2-linux-f2df8c097a3cf0436c22358e11033c2d3b320aa4.tar.xz kernel-qcow2-linux-f2df8c097a3cf0436c22358e11033c2d3b320aa4.zip | |
staging: xgifb: eliminate global XGI_Pr data
Move vb_device_info into xgifb_video_info.
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>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main.h')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 6c1f5e0a1bfc..731262adee9d 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -52,15 +52,15 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); #define SEQ_DATA 0x15 -#define XGISR XGI_Pr.P3c4 -#define XGICR XGI_Pr.P3d4 -#define XGIDACA XGI_Pr.P3c8 -#define XGIDACD XGI_Pr.P3c9 -#define XGIPART1 XGI_Pr.Part1Port -#define XGIPART2 XGI_Pr.Part2Port -#define XGIPART3 XGI_Pr.Part3Port -#define XGIPART4 XGI_Pr.Part4Port -#define XGIPART5 XGI_Pr.Part5Port +#define XGISR (xgifb_info->dev_info.P3c4) +#define XGICR (xgifb_info->dev_info.P3d4) +#define XGIDACA (xgifb_info->dev_info.P3c8) +#define XGIDACD (xgifb_info->dev_info.P3c9) +#define XGIPART1 (xgifb_info->dev_info.Part1Port) +#define XGIPART2 (xgifb_info->dev_info.Part2Port) +#define XGIPART3 (xgifb_info->dev_info.Part3Port) +#define XGIPART4 (xgifb_info->dev_info.Part4Port) +#define XGIPART5 (xgifb_info->dev_info.Part5Port) #define XGIDAC2A XGIPART5 #define XGIDAC2D (XGIPART5 + 1) @@ -143,9 +143,6 @@ static int XGIfb_tvplug = -1; /* TW: For ioctl XGIFB_GET_INFO */ /* XGIfb_info XGIfbinfo; */ -/* TW: XGI private structure */ -static struct vb_device_info XGI_Pr; - #define MD_XGI300 1 #define MD_XGI315 2 |