xf86-video-ati: Branch 'master' - 2 commits

[Michel Daenzer]

 src/radeon_driver.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree d49a60bc939c9f3e9d57c23e44263f5bb52f09fb (from 2b860726fff058623e0e8e1b0aca092c246875ce)
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Thu Aug 30 11:40:13 2007 +0200

    radeon: Fix Option "MacModel".

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 0d12168..9472f93 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -189,7 +189,7 @@ static const OptionInfoRec RADEONOptions
     { OPTION_DEFAULT_CONNECTOR_TABLE, "DefaultConnectorTable", OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DEFAULT_TMDS_PLL, "DefaultTMDSPLL", OPTV_BOOLEAN, {0}, FALSE },
 #if defined(__powerpc__)
-    { OPTION_CONNECTORTABLE, "MacModel",         OPTV_STRING,  {0}, FALSE },
+    { OPTION_MAC_MODEL,      "MacModel",         OPTV_STRING,  {0}, FALSE },
 #endif
     { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
 };
diff-tree 2b860726fff058623e0e8e1b0aca092c246875ce (from 12187a6aa93049c002a4171344d03c713f7f3c5d)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Aug 30 11:38:28 2007 +0200

    radeon: Don't build currently unused RADEONSavePalette.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 5c2efd3..0d12168 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5229,6 +5229,7 @@ static void RADEONSavePLL2Registers(Scrn
 			      >> 16));
 }
 
+#if 0
 /* Read palette data */
 static void RADEONSavePalette(ScrnInfoPtr pScrn, RADEONSavePtr save)
 {
@@ -5248,6 +5249,7 @@ static void RADEONSavePalette(ScrnInfoPt
     for (i = 0; i < 256; i++) save->palette[i] = INPAL_NEXT();
     save->palette_valid = TRUE;
 }
+#endif
 
 /* Save state that defines current video mode */
 static void RADEONSaveMode(ScrnInfoPtr pScrn, RADEONSavePtr save)