summaryrefslogtreecommitdiff
path: root/src/i830.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/i830.h')
-rw-r--r--src/i830.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/i830.h b/src/i830.h
index 4d441b24..800bd56f 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -51,7 +51,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
-#include "i810_reg.h"
#include "xf86Cursor.h"
#include "xf86xv.h"
#include "vgaHW.h"
@@ -71,6 +70,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "intel_bufmgr.h"
#include "i915_drm.h"
+#include "intel_driver.h"
+
#include "uxa.h"
Bool i830_uxa_init(ScreenPtr pScreen);
void i830_uxa_create_screen_resources(ScreenPtr pScreen);
@@ -536,7 +537,7 @@ typedef struct intel_screen_private {
IOADDRESS ioBase;
EntityInfoPtr pEnt;
struct pci_device *PciInfo;
- uint8_t variant;
+ struct intel_chipset chipset;
unsigned int BR[20];
@@ -1105,5 +1106,6 @@ static inline int i830_pad_drawable_width(int width)
return (width + 63) & ~63;
}
+const OptionInfoRec *i830_available_options(int chipid, int busid);
#endif /* _I830_H_ */