xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Mon Oct 31 05:41:52 PDT 2011
src/ati.c | 1 +
src/ati.h | 1 -
src/atipciids.h | 1 +
src/radeon_bios.c | 2 +-
src/radeon_dri.c | 1 -
5 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d3d6a5da07aaec5961e51c9a8f90c1490ee101b6
Author: Tormod Volden <debian.tormod at gmail.com>
Date: Sat Oct 29 23:08:46 2011 +0200
radeon: do not include xf86PciInfo.h
We already use atipciids.h instead most places.
Signed-off-by: Tormod Volden <debian.tormod at gmail.com>
diff --git a/src/ati.c b/src/ati.c
index ea71e88..e1c136f 100644
--- a/src/ati.c
+++ b/src/ati.c
@@ -63,6 +63,7 @@
#include "atipcirename.h"
#include "ati.h"
+#include "atipciids.h"
#include "ativersion.h"
/* names duplicated from version headers */
diff --git a/src/ati.h b/src/ati.h
index 86c40a1..b7120d9 100644
--- a/src/ati.h
+++ b/src/ati.h
@@ -26,7 +26,6 @@
#include <unistd.h>
#include <stdint.h>
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "xf86.h"
diff --git a/src/atipciids.h b/src/atipciids.h
index 5f66aa0..04b5960 100644
--- a/src/atipciids.h
+++ b/src/atipciids.h
@@ -44,6 +44,7 @@
#ifndef PCI_VENDOR_HP
#define PCI_VENDOR_HP 0x103c
#endif
+#define PCI_VENDOR_SONY 0x104D
#include "ati_pciids_gen.h"
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index b53a0ed..5f12534 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -34,7 +34,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
+#include "atipciids.h"
#include "radeon.h"
#include "radeon_reg.h"
#include "radeon_macros.h"
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 07f127c..f1ae65e 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -54,7 +54,6 @@
/* X and server generic header files */
#include "xf86.h"
-#include "xf86PciInfo.h"
#include "windowstr.h"
/* GLX/DRI/DRM definitions */
More information about the xorg-commit
mailing list