xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
diff-tree 2fbbd9c5f0ec27e72780e8b054bc59502f1e5651 (from 81b708dbd35c29bf2d67e8c655af97b60e61498b)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Tue Sep 18 00:45:56 2007 -0400

    RADEON: note that MergedFB support has been replaced with randr 1.2

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index d66400d..4c3a691 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2790,6 +2790,10 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr
 	       "For information on using the multimedia capabilities\n\tof this"
 	       " adapter, please see http://gatos.sf.net.\n");
 
+    xf86DrvMsg(pScrn->scrnIndex, X_NOTICE,
+	       "MergedFB support has been removed and replaced with"
+	       " xrandr 1.2 support\n");
+
     return TRUE;
 
 fail: