xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_bios.c   |    1 -
 src/radeon_driver.c |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9bbb26dd97254b66de11bb2abd821aa293ecba5
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Dec 2 17:00:11 2010 -0500

    Add missing call to vbeFree (bug 4417)
    
    Also kill unneeded vbe.h include from radeon_bios.c.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 5810bdb..b53a0ed 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -40,7 +40,6 @@
 #include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_atombios.h"
-#include "vbe.h"
 
 typedef enum
 {
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 38d5347..e2f605c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2940,6 +2940,7 @@ RADEONProbeDDC(ScrnInfoPtr pScrn, int indx)
     if (xf86LoadSubModule(pScrn, "vbe")) {
 	pVbe = VBEInit(NULL,indx);
 	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+	vbeFree(pVbe);
     }
 }