Stefan Dirsch
7e6a980b1f
Copy from home:oertel:branches:openSUSE:Factory/xorg-x11-server via accept of submit request 35298 revision 8. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/35298 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=229
19 lines
562 B
Diff
19 lines
562 B
Diff
Index: hw/xfree86/common/xf86Helper.c
|
|
================================================================================
|
|
--- hw/xfree86/common/xf86Helper.c
|
|
+++ hw/xfree86/common/xf86Helper.c
|
|
@@ -2183,6 +2183,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;
|
|
}
|
|
|