From ae5b4effc05cd5ac44ab44c5c733c6599652f1eb Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Fri, 20 Jul 2001 20:31:30 +0000 Subject: Remove module name hacks because we aren't going to implement this anymore because of Linus' comments --- libdrm/xf86drm.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'libdrm/xf86drm.c') 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 -- cgit v1.2.3