summaryrefslogtreecommitdiff
path: root/libdrm
diff options
context:
space:
mode:
authorJeff Hartmann <jhartmann@valinux.com>2001-07-20 20:31:30 +0000
committerJeff Hartmann <jhartmann@valinux.com>2001-07-20 20:31:30 +0000
commitae5b4effc05cd5ac44ab44c5c733c6599652f1eb (patch)
tree1559f558990341ec9e62ca68e804616291bf1d0a /libdrm
parent4eafeec960c29369982a9b15c24681a3072f491d (diff)
Remove module name hacks because we aren't going to implement this anymore
because of Linus' comments
Diffstat (limited to 'libdrm')
-rw-r--r--libdrm/xf86drm.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 6a4c5924..a04cf7ae 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -285,32 +285,10 @@ static int drmOpenByName(const char *name)
#if !defined(XFree86Server)
return -1;
#else
- char temp_name[256];
- Bool kernel_loaded = FALSE;
-
- sprintf(temp_name, "%s-%d_%d_%d", name,
- XF86_VERSION_MAJOR,
- XF86_VERSION_MINOR,
- XF86_VERSION_PATCH);
-
- /* first try and load the XF Version number of the module */
- if (!xf86LoadKernelModule(temp_name)) {
- ErrorF("[drm] failed to load kernel module \"%s\"\n",
- temp_name);
- ErrorF("[drm] falling back to older kernel modules\n");
- } else {
- kernel_loaded = TRUE;
- }
-
- /* When we have more releases, add logic here to attempt to load them
- * here.
- */
-
/* try to load the kernel module now */
- if (kernel_loaded == FALSE && !xf86LoadKernelModule(name)) {
+ if (!xf86LoadKernelModule(name)) {
ErrorF("[drm] failed to load kernel module \"%s\"\n",
name);
- ErrorF("[drm] No suitable kernel module found.\n");
return -1;
}
#endif