From 0a63d874e9c2f4fe4b38839a744461f9d41040b2 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue, 6 Feb 2007 21:22:49 -0500
Subject: [PATCH] Always normalize the module name.

---
 hw/xfree86/common/xf86Helper.c | 4 ----
 hw/xfree86/common/xf86Init.c   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 2717a9c11..4636af4e2 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -2429,12 +2429,8 @@ xf86LoadOneModule(char *name, pointer opt)
     if (!name)
 	return NULL;
 
-#ifndef NORMALISE_MODULE_NAME
-    Name = xstrdup(name);
-#else
     /* Normalise the module name */
     Name = xf86NormalizeName(name);
-#endif
 
     /* Skip empty names */
     if (Name == NULL)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 09758986f..666a42449 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1769,12 +1769,8 @@ xf86LoadModules(char **list, pointer *optlist)
 
     for (i = 0; list[i] != NULL; i++) {
 
-#ifndef NORMALISE_MODULE_NAME
-	name = xstrdup(list[i]);
-#else
 	/* Normalise the module name */
 	name = xf86NormalizeName(list[i]);
-#endif
 
 	/* Skip empty names */
 	if (name == NULL || *name == '\0')