[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08

[Thomas White]

The following commit has been merged in the master branch:
commit b0150bab10528c49384b5e3fd29f3ec9e9115e05
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Wed Jul 22 17:31:47 2009 +0100

    ExaClose->GlamoKMSExaClose

diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
index 1d9bac8..0c923c0 100644
--- a/src/glamo-kms-driver.c
+++ b/src/glamo-kms-driver.c
@@ -271,7 +271,7 @@ static Bool GlamoKMSCloseScreen(int scrnIndex, ScreenPtr pScreen)
 	pScreen->CreateScreenResources = pGlamo->createScreenResources;
 
 	if ( pGlamo->exa ) {
-		ExaClose(pScrn);
+		GlamoKMSExaClose(pScrn);
 	}
 
 	drmClose(pGlamo->drm_fd);
diff --git a/src/glamo-kms-exa.c b/src/glamo-kms-exa.c
index 6d84c59..62aa89a 100644
--- a/src/glamo-kms-exa.c
+++ b/src/glamo-kms-exa.c
@@ -775,7 +775,7 @@ ExaModifyPixmapHeader(PixmapPtr pPixmap, int width, int height,
 }
 
 void
-ExaClose(ScrnInfoPtr pScrn)
+GlamoKMSExaClose(ScrnInfoPtr pScrn)
 {
     modesettingPtr ms = modesettingPTR(pScrn);
     struct exa_entity *exa = ms->exa;
@@ -866,7 +866,7 @@ void *GlamoKMSExaInit(ScrnInfoPtr pScrn)
     return (void *)exa;
 
   out_err:
-    ExaClose(pScrn);
+    GlamoKMSExaClose(pScrn);
 
     return NULL;
 }
diff --git a/src/glamo-kms-exa.h b/src/glamo-kms-exa.h
index 6649892..be8e805 100644
--- a/src/glamo-kms-exa.h
+++ b/src/glamo-kms-exa.h
@@ -23,3 +23,4 @@
 #include "xf86.h"
 
 extern void *GlamoKMSExaInit(ScrnInfoPtr pScrn);
+extern void GlamoKMSExaClose(ScrnInfoPtr pScrn);

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org