Commit b33704df authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman

staging/xgifb: Include sis headers

This patch includes the headers of the sis driver and reorders some
includes.

Since the xgi driver used to redefine a lot of stuff from the sis
driver, we can simply include the headers of the sis driver itself, so
we can remove duplicated stuff later on.
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e24b0a3f
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "XGIfb.h" #include "XGIfb.h"
#include "vb_struct.h" #include "vb_struct.h"
#include "../../video/sis/sis.h"
#include "vb_def.h" #include "vb_def.h"
#define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while (0) #define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while (0)
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include "vb_struct.h"
#include "vgatypes.h" #include "vgatypes.h"
#include "vb_struct.h"
enum xgifb_display_type { enum xgifb_display_type {
XGIFB_DISP_NONE = 0, XGIFB_DISP_NONE = 0,
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include "vgatypes.h"
#include "XGIfb.h" #include "XGIfb.h"
#include "vgatypes.h"
#include "vb_def.h" #include "vb_def.h"
#include "vb_struct.h" #include "vb_struct.h"
......
...@@ -10,6 +10,7 @@ struct XGI_LCDDataStruct { ...@@ -10,6 +10,7 @@ struct XGI_LCDDataStruct {
unsigned short LCDVT; unsigned short LCDVT;
}; };
#include "../../video/sis/vstruct.h"
struct XGI_LVDSCRT1HDataStruct { struct XGI_LVDSCRT1HDataStruct {
unsigned char Reg[8]; unsigned char Reg[8];
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
#define _VGATYPES_ #define _VGATYPES_
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/fb.h> /* for struct fb_var_screeninfo for sis.h */
#include "../../video/sis/vgatypes.h"
#include "../../video/sis/sis.h" /* for LCD_TYPE */
#ifndef XGI_VB_CHIP_TYPE #ifndef XGI_VB_CHIP_TYPE
enum XGI_VB_CHIP_TYPE { enum XGI_VB_CHIP_TYPE {
...@@ -19,6 +22,12 @@ enum XGI_VB_CHIP_TYPE { ...@@ -19,6 +22,12 @@ enum XGI_VB_CHIP_TYPE {
}; };
#endif #endif
#define XGI_LCD_TYPE
/* Since the merge with video/sis the LCD_TYPEs are used from
drivers/video/sis/sis.h . Nevertheless we keep this (for the moment) for
future reference until the code is merged completely and we are sure
nothing of this should be added to the sis.h header */
#ifndef XGI_LCD_TYPE #ifndef XGI_LCD_TYPE
enum XGI_LCD_TYPE { enum XGI_LCD_TYPE {
LCD_INVALID = 0, LCD_INVALID = 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment