X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/71d39e274f5c2847a1b2eedd4afa8e298029f93d..7fa4d1679256b06f168bfa5cd1c313a131b53c5e:/package/busybox/config/modutils/Config.in

diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in
index 7c9f50f16..7ffca9384 100644
--- a/package/busybox/config/modutils/Config.in
+++ b/package/busybox/config/modutils/Config.in
@@ -43,7 +43,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM
 config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP
 	bool "Enable load map (-m) option"
 	default n
-	depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES
+	depends on BUSYBOX_CONFIG_INSMOD && ( BUSYBOX_CONFIG_FEATURE_2_4_MODULES || BUSYBOX_CONFIG_FEATURE_2_6_MODULES )
 	help
 	  Enabling this, one would be able to get a load map
 	  output on stdout. This makes kernel module debugging
@@ -74,7 +74,7 @@ config BUSYBOX_CONFIG_LSMOD
 
 config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	bool "lsmod pretty output for 2.6.x Linux kernels "
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_LSMOD
 	help
 	  This option makes output format of lsmod adjusted to
@@ -84,14 +84,15 @@ config BUSYBOX_CONFIG_MODPROBE
 	bool "modprobe"
 	default n
 	help
-	  Handle the loading of modules, and their dependancies on a high
+	  Handle the loading of modules, and their dependencies on a high
 	  level.
 
 	  Note that in the state, modprobe does not understand multiple
 	  module options from the configuration file. See option below.
 
 config BUSYBOX_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
-	bool "Multiple options parsing"
+	bool
+	prompt "Multiple options parsing" if BUSYBOX_CONFIG_NITPICK
 	default n
 	depends on BUSYBOX_CONFIG_MODPROBE
 	help
@@ -106,13 +107,23 @@ config BUSYBOX_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
 	  Saying Y here is not a bad idea if you're not that short
 	  on storage capacity.
 
+config BUSYBOX_CONFIG_FEATURE_MODPROBE_FANCY_ALIAS
+	bool
+	prompt "Fancy alias parsing" if BUSYBOX_CONFIG_NITPICK
+	default n
+	depends on BUSYBOX_CONFIG_MODPROBE && BUSYBOX_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 BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_LSMOD
 
 config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 	# Simulate indentation
-	bool "  Support tainted module checking with new kernels"
-	default n
+	bool "Support tainted module checking with new kernels"
+	default y
 	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD
 	help
 	  Support checking for tainted modules.  These are usually binary
@@ -122,15 +133,15 @@ config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 
 config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
 	# Simulate indentation
-	bool "  Support version 2.2.x to 2.4.x Linux kernels"
-	default y
-	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD
+	bool "Support version 2.2.x to 2.4.x Linux kernels"
+	default n
+	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE
 	help
 	  Support module loading for 2.2.x and 2.4.x Linux kernels.
 
 config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
 	# Simulate indentation
-	bool "  Support version 2.6.x Linux kernels"
+	bool "Support version 2.6.x Linux kernels"
 	default y
 	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE
 	help
@@ -140,7 +151,7 @@ config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
 config BUSYBOX_CONFIG_FEATURE_QUERY_MODULE_INTERFACE
 	bool
 	default n
-	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES
+	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && !BUSYBOX_CONFIG_FEATURE_2_6_MODULES
 
 
 endmenu