xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/atipciids.h  |    2 ++
 src/radeon_dri.c |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4975658f05c387b39b3e96a292a7683f17645c2c
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Feb 27 16:47:19 2010 +1000

    pciids: hopefully fix HP

diff --git a/src/atipciids.h b/src/atipciids.h
index 9bcca95..5f66aa0 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 874b49a..ee62e95 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