staging: xgifb: eliminate global XGIhw_ext data

Move xgi_hw_device_info into xgi_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>

drivers/staging/xgifb/XGI_main.h

@@ -184,9 +184,6 @@ static int XGIfb_tvplug = -1;
 /* TW: For ioctl XGIFB_GET_INFO */
 /* XGIfb_info XGIfbinfo; */
 
-/* TW: Hardware extension; contains data on hardware */
-static struct xgi_hw_device_info XGIhw_ext;
-
 /* TW: XGI private structure */
 static struct vb_device_info  XGI_Pr;
 

drivers/staging/xgifb/XGIfb.h

@@ -3,6 +3,8 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
+#include "vgatypes.h"
+
 #define DISPTYPE_CRT1       0x00000008L
 #define DISPTYPE_CRT2       0x00000004L
 #define DISPTYPE_LCD        0x00000002L
@@ -54,6 +56,7 @@ enum xgi_tv_plug { /* vicki@030226 */
 
 struct video_info {
 	struct fb_info *fb_info;
+	struct xgi_hw_device_info hw_info;
 
 	int           chip_id;
 	unsigned int  video_size;