summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-02-27 16:47:19 +1000
committerDave Airlie <airlied@redhat.com>2010-02-27 16:48:34 +1000
commit4975658f05c387b39b3e96a292a7683f17645c2c (patch)
treea47b0387fb415d0eb74bb54761a85d3343704f9e
parente76b90b399c3cc0f0998c0209300c46f97505498 (diff)
pciids: hopefully fix HP
-rw-r--r--src/atipciids.h2
-rw-r--r--src/radeon_dri.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/atipciids.h b/src/atipciids.h
index 9bcca950..5f66aa0c 100644
--- a/src/atipciids.h
+++ b/src/atipciids.h
@@ -41,7 +41,9 @@
#define PCI_VENDOR_DELL 0x1028
#define PCI_VENDOR_VIA 0x1106
#define PCI_VENDOR_INTEL 0x8086
+#ifndef PCI_VENDOR_HP
#define PCI_VENDOR_HP 0x103c
+#endif
#include "ati_pciids_gen.h"
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 874b49ab..ee62e952 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -51,7 +51,6 @@
#include "radeon_dri.h"
#include "radeon_version.h"
-#include "atipciids.h"
/* X and server generic header files */
#include "xf86.h"
@@ -63,6 +62,8 @@
#include "GL/glxtokens.h"
#include "sarea.h"
+#include "atipciids.h"
+
static size_t radeon_drm_page_size;
#define RADEON_MAX_DRAWABLES 256