diff -Nur xf86-video-geode-2.11.1/src/gx_driver.c xf86-video-geode-2.11.1~/src/gx_driver.c
--- xf86-video-geode-2.11.1/src/gx_driver.c	2009-02-16 13:44:58.000000000 -0500
+++ xf86-video-geode-2.11.1~/src/gx_driver.c	2009-05-11 23:57:34.000000000 -0400
@@ -1250,7 +1250,7 @@
 
 	if (pGeode->useEXA) {
 
-	    if (!(pGeode->pExa = xnfcalloc(sizeof(ExaDriverRec), 1))) {
+	    if (!(pGeode->pExa = exaDriverAlloc())) {
 		xf86DrvMsg(scrnIndex, X_ERROR,
 		    "Couldn't allocate the EXA structure.\n");
 		pGeode->NoAccel = TRUE;
diff -Nur xf86-video-geode-2.11.1/src/lx_driver.c xf86-video-geode-2.11.1~/src/lx_driver.c
--- xf86-video-geode-2.11.1/src/lx_driver.c	2009-02-16 13:44:58.000000000 -0500
+++ xf86-video-geode-2.11.1~/src/lx_driver.c	2009-05-11 23:57:04.000000000 -0400
@@ -842,7 +842,7 @@
 
     if (!pGeode->NoAccel) {
 
-	pGeode->pExa = xnfcalloc(sizeof(ExaDriverRec), 1);
+	pGeode->pExa = exaDriverAlloc();
 
 	if (pGeode->pExa) {