2009-08-04 21:52:16 +02:00
|
|
|
Index: hw/xfree86/common/xf86Helper.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- hw/xfree86/common/xf86Helper.c.orig
|
|
|
|
|
+++ hw/xfree86/common/xf86Helper.c
|
|
|
|
|
@@ -2251,6 +2251,13 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, con
|
2006-12-18 15:48:26 +01:00
|
|
|
&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;
|
|
|
|
|
}
|
|
|
|
|
|
