Patch from Yann Morin to fix bug 941, underscores in module aliases.
diff --git a/modutils/Config.in b/modutils/Config.in
index cf46b08..8974fb7 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -91,7 +91,8 @@
 	  module options from the configuration file. See option below.
 
 config CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
-	bool "Multiple options parsing"
+	bool
+	prompt "Multiple options parsing" if CONFIG_NITPICK
 	default y
 	depends on CONFIG_MODPROBE
 	help
@@ -106,6 +107,16 @@
 	  Saying Y here is not a bad idea if you're not that short
 	  on storage capacity.
 
+config CONFIG_FEATURE_MODPROBE_FANCY_ALIAS
+	bool
+	prompt "Fancy alias parsing" if CONFIG_NITPICK
+	default y
+	depends on CONFIG_MODPROBE && CONFIG_FEATURE_2_6_MODULES
+	help
+	  Say 'y' here to enable parsing of aliases with underscore/dash
+	  mismatch between module name and file name, along with bus-specific
+	  aliases (such as pci:... or usb:... aliases).
+
 comment "Options common to multiple modutils"
 	depends on CONFIG_INSMOD || CONFIG_RMMOD || CONFIG_MODPROBE || CONFIG_LSMOD