Merge branch 'master' into atombios-support

Conflicts:

	src/radeon_output.c

1 files changed, 14 insertions, 9 deletions

diff --git a/src/radeon.h b/src/radeon.h
index 76dcec7..2870ef5 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -158,7 +158,9 @@ typedef enum {
     OPTION_MAC_MODEL,
 #endif
     OPTION_DEFAULT_TMDS_PLL,
-    OPTION_TVDAC_LOAD_DETECT
+    OPTION_TVDAC_LOAD_DETECT,
+    OPTION_FORCE_TVOUT,
+    OPTION_TVSTD
 } RADEONOpts;
 
 
@@ -544,18 +546,21 @@ typedef enum {
 } RADEONErrata;
 
 typedef enum {
-    RADEON_SIL_164  = 0x00000001,
-    RADEON_SIL_1178 = 0x00000002
+    RADEON_DVOCHIP_NONE,
+    RADEON_SIL_164,
+    RADEON_SIL_1178
 } RADEONExtTMDSChip;
 
 #if defined(__powerpc__)
 typedef enum {
-       RADEON_MAC_IBOOK              = 0x00000001,
-       RADEON_MAC_POWERBOOK_EXTERNAL = 0x00000002,
-       RADEON_MAC_POWERBOOK_INTERNAL = 0x00000004,
-       RADEON_MAC_POWERBOOK_VGA      = 0x00000008,
-       RADEON_MAC_MINI_EXTERNAL      = 0x00000016,
-       RADEON_MAC_MINI_INTERNAL      = 0x00000032
+    RADEON_MAC_NONE,
+    RADEON_MAC_IBOOK,
+    RADEON_MAC_POWERBOOK_EXTERNAL,
+    RADEON_MAC_POWERBOOK_INTERNAL,
+    RADEON_MAC_POWERBOOK_VGA,
+    RADEON_MAC_MINI_EXTERNAL,
+    RADEON_MAC_MINI_INTERNAL,
+    RADEON_MAC_IMAC_G5_ISIGHT
 } RADEONMacModel;
 #endif