--- hw/xfree86/common/xf86Helper.c.orig	2006-12-13 16:21:35.000000000 +0100
+++ hw/xfree86/common/xf86Helper.c	2006-12-13 18:23:53.000000000 +0100
@@ -2394,6 +2394,13 @@
 			&errmaj, &errmin);
     if (!ret)
 	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
+
+    /* "drm" module has been merged into "dri" module, but some drivers
+        are still trying to load it explictely and fail if it doesn't exist :-( */
+    if (!ret && !strcmp(name,"drm")) {
+        ret = (pointer) -1;
+    }
+
     return ret;
 }