rework the kernel menuconfig,

always use prompt to display config text instead of bool/tristate

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2315 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 files changed, 26 insertions, 29 deletions

diff --git a/target/linux/package/alsa/Config.in b/target/linux/package/alsa/Config.in
index b8cabe280..62dd21b97 100644
--- a/target/linux/package/alsa/Config.in
+++ b/target/linux/package/alsa/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_ALSA
-	tristate "kmod-alsa...................... Alsa Sound Drivers"
+	prompt "kmod-alsa......................... Alsa Sound Drivers"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 	select BR2_PACKAGE_KMOD_SOUNDCORE
diff --git a/target/linux/package/diag/Config.in b/target/linux/package/diag/Config.in
index b68a0ee09..a33f81267 100644
--- a/target/linux/package/diag/Config.in
+++ b/target/linux/package/diag/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_DIAG
-	tristate "kmod-diag...................... Driver for router LEDs and Buttons"
+	prompt "kmod-diag......................... Driver for router LEDs and Buttons"
+	tristate
 	default y
 	help
 	  Driver for router LEDs and Buttons
diff --git a/target/linux/package/fuse/Config.in b/target/linux/package/fuse/Config.in
index 4e87aaa85..8fbb34c07 100644
--- a/target/linux/package/fuse/Config.in
+++ b/target/linux/package/fuse/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_KMOD_FUSE
-	tristate "kmod-fuse...................... FUSE kernel module"
+	prompt "kmod-fuse......................... FUSE kernel module"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_FUSE
 	help
 	  With FUSE it is possible to implement a fully functional 
 	  filesystem in a userspace program.
@@ -16,7 +16,4 @@ config BR2_PACKAGE_KMOD_FUSE
 	   * Runs on Linux kernels 2.4.X and 2.6.X
 	   * Has proven very stable over time
 	  
-	  
 	  http://fuse.sourceforge.net/
-	  
-	  This package contains the fuse.o kernel module.
diff --git a/target/linux/package/hostap/Config.in b/target/linux/package/hostap/Config.in
index 56286b400..700eb963f 100644
--- a/target/linux/package/hostap/Config.in
+++ b/target/linux/package/hostap/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_HOSTAP
-	tristate "kmod-hostap.................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
+	prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
@@ -11,12 +12,10 @@ config BR2_PACKAGE_KMOD_HOSTAP
 	  PLX/PCI/CS version of the driver to actually use the driver.
 	  
 	  http://hostap.epitest.fi/
-	  
-	  This package contains the hostap.o and hostap_crypt_wep.o kernel modules.
-	  
 
 config BR2_PACKAGE_KMOD_HOSTAP_PCI
-	tristate   "kmod-hostap-pci.............. Host AP driver for Prism2.5 PCI adaptors"
+	prompt   "kmod-hostap-pci................. Host AP driver for Prism2.5 PCI adaptors"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_HOSTAP
 	help
@@ -25,12 +24,10 @@ config BR2_PACKAGE_KMOD_HOSTAP_PCI
 	  driver.
 	  
 	  http://hostap.epitest.fi/
-	  
-	  This package contains the hostap_pci.o kernel module.
-	  
 
 config BR2_PACKAGE_KMOD_HOSTAP_PLX
-	tristate   "kmod-hostap-plx.............. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
+	prompt   "kmod-hostap-plx................. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_HOSTAP
 	help
@@ -39,7 +36,4 @@ config BR2_PACKAGE_KMOD_HOSTAP_PLX
 	  driver.
 	  
 	  http://hostap.epitest.fi/
-	  
-	  This package contains the hostap_plx.o kernel module.
-	  
 
diff --git a/target/linux/package/madwifi/Config.in b/target/linux/package/madwifi/Config.in
index ad7ef4af2..c0e95be87 100644
--- a/target/linux/package/madwifi/Config.in
+++ b/target/linux/package/madwifi/Config.in
@@ -1,5 +1,8 @@
 config BR2_PACKAGE_KMOD_MADWIFI
-	tristate "kmod-madwifi................... Atheros Wifi driver"
+	prompt "kmod-madwifi...................... Atheros Wifi driver"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Driver for Atheros 802.11a/b/g MiniPCI cards
+	  
+	  http://www.madwifi.org/
diff --git a/target/linux/package/mini_fo/Config.in b/target/linux/package/mini_fo/Config.in
index 2f1b68134..a92ff9785 100644
--- a/target/linux/package/mini_fo/Config.in
+++ b/target/linux/package/mini_fo/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_KMOD_MINI_FO
-	tristate "kmod-mini_fo................... mini fanout overlay file system"
+	prompt "kmod-mini_fo...................... mini fanout overlay file system"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The mini fanout overlay file system.
-	  
-	  This package contains the mini_fo.o kernel module.
diff --git a/target/linux/package/openswan/Config.in b/target/linux/package/openswan/Config.in
index 46fff1049..59a943f8e 100644
--- a/target/linux/package/openswan/Config.in
+++ b/target/linux/package/openswan/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_OPENSWAN
-	tristate "kmod-openswan.................. Openswan kernel module"
+	prompt "kmod-openswan..................... Openswan kernel module"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Openswan is an implementation of IPsec for Linux.
diff --git a/target/linux/package/shfs/Config.in b/target/linux/package/shfs/Config.in
index 3718cd74d..61bd54b5e 100644
--- a/target/linux/package/shfs/Config.in
+++ b/target/linux/package/shfs/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_SHFS
-	tristate "kmod-shfs...................... Shell FileSystem kernel module (ShFS) kernel module"
+	prompt "kmod-shfs......................... Shell FileSystem kernel module (ShFS) kernel module"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  ShFS is a simple and easy to use Linux kernel module which 
@@ -19,5 +20,3 @@ config BR2_PACKAGE_KMOD_SHFS
 	   * persistent connection (reconnect after SSH dies) 
 	  
 	  http://shfs.sourceforge.net/
-	  
-	  This package contains the shfs.o kernel module.
diff --git a/target/linux/package/wlcompat/Config.in b/target/linux/package/wlcompat/Config.in
index a157c0797..e7d2b2c8b 100644
--- a/target/linux/package/wlcompat/Config.in
+++ b/target/linux/package/wlcompat/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_WLCOMPAT
-	tristate "kmod-wlcompat.................. Wrapper providing Wireless Extensions for Broadcom wl module"
+	prompt "kmod-wlcompat..................... Wrapper providing Wireless Extensions for Broadcom wl module"
+	tristate
 	default y
 	depends BR2_PACKAGE_KMOD_BRCM_WL
 	help
@@ -7,7 +8,8 @@ config BR2_PACKAGE_KMOD_WLCOMPAT
 	  proprietary Broadcom wl module.
 
 config BR2_PACKAGE_KMOD_WLCOMPAT_DEBUG
-	tristate "kmod-wlcompat-debug............ Wrapper providing Wireless Extensions for Broadcom wl module (debug)"
+	prompt "kmod-wlcompat-debug............... Wrapper providing Wireless Extensions for Broadcom wl module (debug)"
+	tristate
 	default m
 	depends BR2_PACKAGE_KMOD_BRCM_WL
 	help