summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGIfb.h
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-10-11 21:47:15 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-12 09:51:44 -0600
commitc62f2e466f875a5eedb4d4f52115c3e7d1cb52f6 (patch)
tree889044764507678f651a347ea0a4f1a05bbd81aa /drivers/staging/xgifb/XGIfb.h
parent19c1e88e02c63008745c8549513e53df4aac868f (diff)
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>
Diffstat (limited to 'drivers/staging/xgifb/XGIfb.h')
-rw-r--r--drivers/staging/xgifb/XGIfb.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 83a191173081..9b5552ba441a 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/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;