Merge branch 'master' into atombios-support

Conflicts:

	src/radeon_chipset.h
	src/radeon_driver.c
	src/radeon_probe.c

1 files changed, 10 insertions, 0 deletions

diff --git a/src/radeon.h b/src/radeon.h
index 8fffafe2..d503f928 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -548,6 +548,16 @@ typedef enum {
 typedef struct _atomBiosHandle *atomBiosHandlePtr;
 
 typedef struct {
+    CARD32 pci_device_id;
+    RADEONChipFamily chip_family;
+    int mobility;
+    int igp;
+    int nocrtc2;
+    int nointtvout;
+    int singledac;
+} RADEONCardInfo;
+
+typedef struct {
     EntityInfoPtr     pEnt;
     pciVideoPtr       PciInfo;
     PCITAG            PciTag;