summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-02-27 16:47:19 +1000
committerAlex Deucher <alexdeucher@gmail.com>2010-03-02 20:31:13 -0500
commit58738d5abb5e6f0622747cb6cdc8d09d4c5b0ade (patch)
treedeb8b61e591ce66e0bd478970fa4fd73fde82b06 /src
parentaf13ce94d8631fa3d111de8fdf8765c65fba6bf7 (diff)
pciids: hopefully fix HP
Diffstat (limited to 'src')
-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 d67d649e..7eceef20 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