continue massive kernel menuconfig reorganization

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

30 files changed, 463 insertions, 402 deletions

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index c43f25d30e..f360a0c121 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -79,25 +79,12 @@ config BR2_PACKAGE_KMOD_BRCM_ET
 	help
 	  Proprietary driver for Broadcom Ethernet chipsets
 
-config BR2_PACKAGE_KMOD_B44
-	tristate "Broadcom 44XX, 47XX ethernet driver"
-	default m
-	default y if BR2_LINUX_2_6_BRCM
-	help
-	  Free driver for Broadcom Ethernet chipsets (without switch support)
-
 config BR2_PACKAGE_KMOD_ARPT
 	tristate "ARP firewalling support"
 	default m
 	help
 	  Kernel modules for ARP firewalling
 
-config BR2_PACKAGE_KMOD_BLUETOOTH
-	tristate "Bluetooth drivers and network stack"
-	default m
-	help
-	  Bluetooth drivers and network stack
-
 config BR2_PACKAGE_KMOD_EBT
 	tristate "Ethernet Bridge firewalling support"
 	default m
@@ -110,14 +97,6 @@ config BR2_PACKAGE_KMOD_IPTABLES_V4
 	help
 	  Kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_AX25
-	tristate "AX25 support"
-	default m
-	help
-	  Kernel modules for AX25 protocol family
-	   - ax25.o: AX25 layer 2 support
-	   - mkiss.o: AX25 KISS driver
-
 config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
 	tristate "Extra modules for iptables"
 	default m
@@ -137,99 +116,6 @@ config BR2_PACKAGE_KMOD_IPTABLES_V6
 	help
 	  IPv6 firewalling support
 
-config BR2_PACKAGE_KMOD_NFS
-	tristate "NFS support"
-	default m
-	help
-	  Kernel modules for NFS support
-	  Includes lockd, nfs and sunrpc
-
-config BR2_PACKAGE_KMOD_CIFS
-	tristate "CIFS support"
-	default m
-	help
-	  Kernel modules for CIFS support
-
-config BR2_PACKAGE_KMOD_SOUNDCORE
-	tristate "Soundcard support"
-	default n
-	help
-	  Base support for soundcards
-	  Requires either USB soundcard support (OSS) or ALSA package to be useful
-
-config BR2_PACKAGE_KMOD_USB
-	tristate "USB support"
-	default m
-
-config BR2_PACKAGE_KMOD_USB_CONTROLLER
-	tristate
-	depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
-	default n
-
-config BR2_PACKAGE_KMOD_USB_UHCI
-	tristate "Support for UHCI controllers"
-	default m
-	depends BR2_PACKAGE_KMOD_USB
-	select BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_OHCI
-	tristate "Support for OHCI controllers"
-	default m
-	depends BR2_PACKAGE_KMOD_USB
-	select BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB2
-	tristate "Support for USB 2.0 controllers"
-	default m
-	depends BR2_PACKAGE_KMOD_USB
-	select BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_SERIAL
-	tristate "kmod-usb-serial - Support for USB-to-serial converters"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
-	tristate "kmod-usb-serial-belkin - Support for Belkin USB-to-serial converters"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
-	tristate "kmod-usb-serial-ftdi - Support for FTDI USB-to-serial converterr"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232
-	tristate "kmod-usb-serial-mct-u232 - Support for Magic Control Technology USB-to-Serial converters"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
-	tristate "kmod-usb-serial-pl2303 - Support for Prolific PL2303 USB-to-Serial converters"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_SERIAL
-
-config BR2_PACKAGE_KMOD_USB_STORAGE
-	tristate "Support for USB storage devices"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_PRINTER
-	tristate "Support for USB printers"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
-config BR2_PACKAGE_KMOD_USB_AUDIO
-	tristate "Support for USB soundcards"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-	select BR2_PACKAGE_KMOD_SOUNDCORE
-
-config BR2_PACKAGE_KMOD_USB_ACM
-	tristate "Support for USB modems/isdn controllers"
-	default m
-	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-
 config BR2_PACKAGE_KMOD_IDE
 	tristate "IDE support"
 	default m
@@ -237,39 +123,6 @@ config BR2_PACKAGE_KMOD_IDE
 	  Kernel modules for IDE support
 	  useful for usb mass storage devices (e.g. on WL-HDD)
 
-config BR2_PACKAGE_KMOD_VFAT
-	tristate "VFAT filesystem support"
-	default m
-	depends on BR2_PACKAGE_KMOD_NLS_BASE
-	depends on BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850
-	help
-	  Kernel modules for VFAT filesystem support
-	  useful for usb mass storage devices
-
-config BR2_PACKAGE_KMOD_EXT2
-	tristate "EXT2 filesystem support"
-	default m
-	help
-	  Kernel modules for EXT2 filesystem support
-
-config BR2_PACKAGE_KMOD_EXT3
-	tristate "EXT3 filesystem support"
-	default m
-	help
-	  Kernel modules for EXT3 filesystem support
-
-config BR2_PACKAGE_KMOD_XFS
-	tristate "XFS filesystem support"
-	default m
-	help
-	  Kernel modules for XFS filesystem support
-
-config BR2_PACKAGE_KMOD_HFSPLUS
-	tristate "HFS+ filesystem support"
-	default m
-	help
-	  Kernel modules for HFS+ filesystem support
-
 config BR2_PACKAGE_KMOD_LOOP
 	tristate "loop mount support"
 	default m
@@ -349,63 +202,117 @@ config BR2_PACKAGE_KMOD_SCHED
 	help
 	  Kernel schedulers for IP traffic
 
-comment "Multimedia devices support ---"
+comment "Filesystems support -----------"
 
-config BR2_PACKAGE_KMOD_VIDEODEV
-	tristate "kmod-videodev - Video (For Linux) kernel support"
+config BR2_PACKAGE_KMOD_CIFS
+	tristate "kmod-fs-cifs................... CIFS support"
 	default m
+	help
+	  Kernel modules for CIFS support
 
-config BR2_PACKAGE_KMOD_PWC
-	tristate "kmod-pwc - Kernel driver for USB Philips Cameras"
+config BR2_PACKAGE_KMOD_FS_EXT2
+	tristate "kmod-fs-ext2................... EXT2 filesystem support"
 	default m
+	help
+	  Kernel modules for EXT2 filesystem support
 
-comment "Native language support ---"
+config BR2_PACKAGE_KMOD_FS_EXT3
+	tristate "kmod-fs-ext3................... EXT3 filesystem support"
+	default m
+	help
+	  Kernel modules for EXT3 filesystem support
 
-config BR2_PACKAGE_KMOD_NLS_BASE
-	tristate "kmod-nls-base - Basic native language support for filesystems"
+config BR2_PACKAGE_KMOD_FS_HFSPLUS
+	tristate "kmod-fs-hfsplus................ HFS+ filesystem support"
 	default m
 	help
-	  Kernel native language support
+	  Kernel modules for HFS+ filesystem support
+
+config BR2_PACKAGE_KMOD_FS_NFS
+	tristate "kmod-fs-nfs.................... NFS support"
+	default m
+	help
+	  Kernel modules for NFS support
+	  Includes lockd, nfs and sunrpc
+
+config BR2_PACKAGE_KMOD_FS_VFAT
+	tristate "kmod-fs-vfat................... VFAT filesystem support"
+	default m
+	help
+	  Kernel modules for VFAT filesystem support
+	  useful for usb mass storage devices
+
+config BR2_PACKAGE_KMOD_FS_XFS
+	tristate "kmod-fs-xfs.................... XFS filesystem support"
+	default m
+	help
+	  Kernel modules for XFS filesystem support
+
+comment "Multimedia devices support ----"
+
+config BR2_PACKAGE_KMOD_PWC
+	tristate "kmod-pwc....................... Kernel driver for USB Philips Cameras"
+	default m
+
+config BR2_PACKAGE_KMOD_SOUNDCORE
+	tristate "kmod-soundcore................. Soundcard support"
+	default n
+	help
+	  Base support for soundcards
+	  Requires either USB soundcard support (OSS) or ALSA package to be useful
+
+config BR2_PACKAGE_KMOD_VIDEODEV
+	tristate "kmod-videodev.................. Video (For Linux) kernel support"
+	default m
+
+comment "Native Language support -------"
 
 config BR2_PACKAGE_KMOD_NLS_CP437
-	tristate "kmod-nls-cp437 - Codepage 437 (United States, Canada)"
+	tristate "kmod-nls-cp437................. Codepage 437 (United States, Canada)"
 	default m
-	select BR2_PACKAGE_KMOD_NLS_BASE
+	select BR2_PACKAGE_KMOD_NLS
 	help
 	  Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_CP850
-	tristate "kmod-nls-cp850 - Codepage 850 (Europe)"
+	tristate "kmod-nls-cp850................. Codepage 850 (Europe)"
 	default m
-	select BR2_PACKAGE_KMOD_NLS_BASE
+	select BR2_PACKAGE_KMOD_NLS
 	help
 	  Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_IS08859_1
-	tristate "kmod-nls-iso8859-1 -  NLS ISO 8859-1  (Latin 1; Western European Languages)"
+	tristate "kmod-nls-iso8859-1............. NLS ISO 8859-1  (Latin 1; Western European Languages)"
 	default m
-	select BR2_PACKAGE_KMOD_NLS_BASE
+	select BR2_PACKAGE_KMOD_NLS
 	help
 	  Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_IS08859_15
-	tristate "kmod-nls-iso8859-15 -  NLS ISO 8859-15  (Latin 15; Western European Languages with Euro)"
+	tristate "kmod-nls-iso8859-15............ NLS ISO 8859-15  (Latin 15; Western European Languages with Euro)"
 	default m
-	select BR2_PACKAGE_KMOD_NLS_BASE
+	select BR2_PACKAGE_KMOD_NLS
 	help
 	  Kernel native language support
 
 config BR2_PACKAGE_KMOD_NLS_UTF8
-	tristate "kmod-nls-utf8 - NLS UTF8"
+	tristate "kmod-nls-utf8.................. NLS UTF8"
+	default m
+	select BR2_PACKAGE_KMOD_NLS
+	help
+	  Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS
+	tristate
 	default m
-	select BR2_PACKAGE_KMOD_NLS_BASE
+	depends BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850 || BR2_PACKAGE_KMOD_NLS_IS08859_1 || BR2_PACKAGE_KMOD_NLS_IS08859_15 || BR2_PACKAGE_KMOD_NLS_UTF8
 	help
 	  Kernel native language support
 
-comment "Network devices support ---"
+comment "Network devices support -------"
 
 config BR2_PACKAGE_KMOD_NET_3C59X
-	tristate "kmod-net-3C59x - 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+	tristate "kmod-net-3C59x................. 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
 	default m
 	help
 	  This option enables driver support for a large number of 10mbps and 
@@ -421,7 +328,7 @@ config BR2_PACKAGE_KMOD_NET_3C59X
 	  
 
 config BR2_PACKAGE_KMOD_NET_8139TOO
-	tristate "kmod-net-8139too - RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
+	tristate "kmod-net-8139too............... RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
 	default m
 	help
 	  This is a driver for the Fast Ethernet PCI network cards based on 
@@ -431,7 +338,7 @@ config BR2_PACKAGE_KMOD_NET_8139TOO
 	  
 
 config BR2_PACKAGE_KMOD_NET_AIRO
-	tristate "kmod-net-airo - Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
+	tristate "kmod-net-airo.................. Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
 	default m
 	help
 	  This is the standard Linux driver to support Cisco/Aironet ISA and 
@@ -447,8 +354,16 @@ config BR2_PACKAGE_KMOD_NET_AIRO
 	  This package contains the airo.o kernel module.
 	  
 
+config BR2_PACKAGE_KMOD_B44
+	tristate "kmod-net-b44................... Broadcom 44XX, 47XX ethernet driver"
+	default m
+	default y if BR2_LINUX_2_6_BRCM
+	help
+	  Free driver for Broadcom Ethernet chipsets (without switch support)
+	  
+
 config BR2_PACKAGE_KMOD_NET_HERMES
-	tristate "kmod-net-hermes - Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
+	tristate "kmod-net-hermes................ Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
 	default m
 	help
 	  A driver for 802.11b wireless cards based based on the "Hermes" or 
@@ -465,7 +380,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES
 	  
 
 config BR2_PACKAGE_KMOD_NET_HERMES_PCI
-	tristate "kmod-net-hermes-pci - Intersil Prism 2.5 PCI 802.11b adaptor support"
+	tristate   "kmod-net-hermes-pci.......... Intersil Prism 2.5 PCI 802.11b adaptor support"
 	default m
 	depends BR2_PACKAGE_KMOD_NET_HERMES
 	help
@@ -479,7 +394,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PCI
 	  
 
 config BR2_PACKAGE_KMOD_NET_HERMES_PLX
-	tristate "kmod-net-hermes-plx - Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support"
+	tristate   "kmod-net-hermes-plx.......... Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support"
 	default m
 	depends BR2_PACKAGE_KMOD_NET_HERMES
 	help
@@ -494,7 +409,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 	  
 
 config BR2_PACKAGE_KMOD_NET_NATSEMI
-	tristate "kmod-net-natsemi - National Semiconductor DP8381x series PCI Ethernet kernel support"
+	tristate "kmod-net-natsemi............... National Semiconductor DP8381x series PCI Ethernet kernel support"
 	default m
 	help
 	  This driver is for the National Semiconductor DP83810 series, 
@@ -505,7 +420,7 @@ config BR2_PACKAGE_KMOD_NET_NATSEMI
 	  
 
 config BR2_PACKAGE_KMOD_NET_PRISM54
-	tristate "kmod-net-prism54 - Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
+	tristate "kmod-net-prism54............... Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
 	default m
 	help
 	  Enable PCI and Cardbus support for the following chipset based cards: 
@@ -544,16 +459,108 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
 	  This package contains the prism54.o kernel module.
 	  
 
-comment "Misc. device support ---"
+comment "USB support -------------------"
+
+config BR2_PACKAGE_KMOD_USB
+	tristate "kmod-usb....................... USB support"
+	default m
+
+config BR2_PACKAGE_KMOD_USB_UHCI
+	tristate   "kmod-usb-uhci................ Support for UHCI controllers"
+	default m
+	depends BR2_PACKAGE_KMOD_USB
+	select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_OHCI
+	tristate   "kmod-usb-ohci................ Support for OHCI controllers"
+	default m
+	depends BR2_PACKAGE_KMOD_USB
+	select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB2
+	tristate   "kmod-usb2.................... Support for USB 2.0 controllers"
+	default m
+	depends BR2_PACKAGE_KMOD_USB
+	select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_CONTROLLER
+	tristate
+	depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
+	default n
+
+config BR2_PACKAGE_KMOD_USB_ACM
+	tristate "kmod-usb-acm................... Support for USB modems/isdn controllers"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_AUDIO
+	tristate "kmod-usb-audio................. Support for USB soundcards"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+	select BR2_PACKAGE_KMOD_SOUNDCORE
+
+config BR2_PACKAGE_KMOD_USB_PRINTER
+	tristate "kmod-usb-printer............... Support for USB printers"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_SERIAL
+	tristate "kmod-usb-serial................ Support for USB-to-serial converters"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
+	tristate   "kmod-usb-serial-belkin....... Support for Belkin USB-to-serial converters"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
+	tristate   "kmod-usb-serial-ftdi......... Support for FTDI USB-to-serial converterr"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232
+	tristate   "kmod-usb-serial-mct-u232..... Support for Magic Control Technology USB-to-Serial converters"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
+	tristate   "kmod-usb-serial-pl2303....... Support for Prolific PL2303 USB-to-Serial converters"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_STORAGE
+	tristate "kmod-usb-storage............... Support for USB storage devices"
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+comment "Misc. device support ----------"
+
+config BR2_PACKAGE_KMOD_AX25
+	tristate "kmod-ax25...................... AX25 support"
+	default m
+	help
+	  Kernel modules for AX25 protocol family
+	   - ax25.o: AX25 layer 2 support
+	   - mkiss.o: AX25 KISS driver
+	  
+
+config BR2_PACKAGE_KMOD_BLUETOOTH
+	tristate "kmod-bluetooth................. Bluetooth drivers and network stack"
+	default m
+	help
+	  Bluetooth drivers and network stack
+	  
 
 config BR2_PACKAGE_KMOD_WD1100
-	tristate "Soekris net4801 watchdog"
+	tristate "kmod-wd1100.................... Soekris net4801 watchdog"
 	default y
 	depends BR2_LINUX_2_4_X86
 	help
 	  Driver for the NatSemi SC1x00 series Watchdog 
 	  found on Soekris net4801 boards
+	  
 
-comment "Additional kernel modules ---"
+comment "Additional kernel modules -----"
 
 source "target/linux/package/Config.in"
diff --git a/openwrt/target/linux/control/kmod-cifs.control b/openwrt/target/linux/control/kmod-cifs.control
deleted file mode 100644
index 4704d69f58..0000000000
--- a/openwrt/target/linux/control/kmod-cifs.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-cifs
-Priority: optional
-Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Kernel modules for CIFS support
diff --git a/openwrt/target/linux/control/kmod-ext2.control b/openwrt/target/linux/control/kmod-ext2.control
deleted file mode 100644
index 546dfcb76c..0000000000
--- a/openwrt/target/linux/control/kmod-ext2.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-ext2
-Priority: optional
-Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Kernel modules for EXT2 filesystem support
diff --git a/openwrt/target/linux/control/kmod-ext3.control b/openwrt/target/linux/control/kmod-ext3.control
deleted file mode 100644
index 1340d58d57..0000000000
--- a/openwrt/target/linux/control/kmod-ext3.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-ext3
-Priority: optional
-Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Kernel modules for EXT3 filesystem support
diff --git a/openwrt/target/linux/control/kmod-fs-cifs.control b/openwrt/target/linux/control/kmod-fs-cifs.control
new file mode 100644
index 0000000000..832224764d
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-cifs.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-cifs
+Priority: optional
+Section: sys
+Description: Kernel modules for CIFS support
diff --git a/openwrt/target/linux/control/kmod-fs-ext2.control b/openwrt/target/linux/control/kmod-fs-ext2.control
new file mode 100644
index 0000000000..ec06cffe23
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-ext2.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-ext2
+Priority: optional
+Section: sys
+Description: Kernel modules for EXT2 filesystem support
diff --git a/openwrt/target/linux/control/kmod-fs-ext3.control b/openwrt/target/linux/control/kmod-fs-ext3.control
new file mode 100644
index 0000000000..735178895d
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-ext3.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-ext3
+Priority: optional
+Section: sys
+Description: Kernel modules for EXT3 filesystem support
diff --git a/openwrt/target/linux/control/kmod-fs-hfsplus.control b/openwrt/target/linux/control/kmod-fs-hfsplus.control
new file mode 100644
index 0000000000..bb59553338
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-hfsplus.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-hfsplus
+Priority: optional
+Section: sys
+Description: Kernel modules for HFS+ filesystem support
diff --git a/openwrt/target/linux/control/kmod-fs-nfs.control b/openwrt/target/linux/control/kmod-fs-nfs.control
new file mode 100644
index 0000000000..32dc9ff323
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-nfs.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-nfs
+Priority: optional
+Section: sys
+Description: Kernel modules for NFS support
diff --git a/openwrt/target/linux/control/kmod-fs-vfat.control b/openwrt/target/linux/control/kmod-fs-vfat.control
new file mode 100644
index 0000000000..cc2983313d
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-vfat.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-vfat
+Priority: optional
+Section: sys
+Description: Kernel modules for VFAT filesystem support
diff --git a/openwrt/target/linux/control/kmod-fs-xfs.control b/openwrt/target/linux/control/kmod-fs-xfs.control
new file mode 100644
index 0000000000..8efd35a666
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-fs-xfs.control
@@ -0,0 +1,4 @@
+Package: kmod-fs-xfs
+Priority: optional
+Section: sys
+Description: Kernel modules for XFS filesystem support
diff --git a/openwrt/target/linux/control/kmod-hfsplus.control b/openwrt/target/linux/control/kmod-hfsplus.control
deleted file mode 100644
index bb72a5f09d..0000000000
--- a/openwrt/target/linux/control/kmod-hfsplus.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-hfsplus
-Priority: optional
-Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Kernel modules for HFS+ filesystem support
diff --git a/openwrt/target/linux/control/kmod-b44.control b/openwrt/target/linux/control/kmod-net-b44.control
index b09a78a4c6..e70e2fb035 100644
--- a/openwrt/target/linux/control/kmod-b44.control
+++ b/openwrt/target/linux/control/kmod-net-b44.control
@@ -1,6 +1,4 @@
-Package: kmod-b44
+Package: kmod-net-b44
 Priority: optional
 Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
 Description: Free driver for Broadcom 44Xx, 47XX Ethernet chipset
diff --git a/openwrt/target/linux/control/kmod-nfs.control b/openwrt/target/linux/control/kmod-nfs.control
deleted file mode 100644
index 3848b28917..0000000000
--- a/openwrt/target/linux/control/kmod-nfs.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-nfs
-Priority: optional
-Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Kernel modules for NFS support
diff --git a/openwrt/target/linux/control/kmod-vfat.control b/openwrt/target/linux/control/kmod-vfat.control
deleted file mode 100644
index 3c1b40c484..0000000000
--- a/openwrt/target/linux/control/kmod-vfat.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-vfat
-Priority: optional
-Section: sys
-Maintainer: Waldemar Brodkorb <wbx@dass-it.de>
-Source: buildroot internal
-Description: Kernel modules for VFAT filesystem support
diff --git a/openwrt/target/linux/control/kmod-xfs.control b/openwrt/target/linux/control/kmod-xfs.control
deleted file mode 100644
index 494e94cbd5..0000000000
--- a/openwrt/target/linux/control/kmod-xfs.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: kmod-xfs
-Priority: optional
-Section: sys
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Kernel modules for XFS filesystem support
diff --git a/openwrt/target/linux/imagebuilder/lists/default.x86-2.4 b/openwrt/target/linux/imagebuilder/lists/default.x86-2.4
index 8ad11d0be3..890efef6f9 100644
--- a/openwrt/target/linux/imagebuilder/lists/default.x86-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/default.x86-2.4
@@ -5,7 +5,7 @@ busybox
 dnsmasq
 dropbear
 iptables
-kmod-natsemi
+kmod-net-natsemi
 kmod-ppp
 kmod-pppoe
 libgcc
diff --git a/openwrt/target/linux/imagebuilder/lists/micro.x86-2.4 b/openwrt/target/linux/imagebuilder/lists/micro.x86-2.4
index 2b03720d14..2ff92cac7a 100644
--- a/openwrt/target/linux/imagebuilder/lists/micro.x86-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/micro.x86-2.4
@@ -6,7 +6,7 @@ dnsmasq
 dropbear
 iptables
 hotplug
-kmod-natsemi
+kmod-net-natsemi
 libgcc
 mtd
 uclibc
diff --git a/openwrt/target/linux/imagebuilder/lists/pptp.x86-2.4 b/openwrt/target/linux/imagebuilder/lists/pptp.x86-2.4
index de982576c9..1fa77b21f6 100644
--- a/openwrt/target/linux/imagebuilder/lists/pptp.x86-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/pptp.x86-2.4
@@ -6,7 +6,7 @@ dnsmasq
 dropbear
 iptables
 hotplug
-kmod-natsemi
+kmod-net-natsemi
 kmod-ppp
 kmod-gre
 libgcc
diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index 4b2589c2cd..4acbce14ee 100644
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -57,17 +57,6 @@ $(eval $(call KMOD_template,ATM,atm,\
 $(eval $(call KMOD_template,PPPOATM,pppoatm,\
 	$(MODULES_DIR)/kernel/net/atm/pppoatm.o \
 ,CONFIG_PPPOATM))
-$(eval $(call KMOD_template,USB_ACM,usb-acm,\
-	$(MODULES_DIR)/kernel/drivers/usb/acm.o \
-,CONFIG_USB_ACM))
-$(eval $(call KMOD_template,B44,b44,\
-	$(MODULES_DIR)/kernel/drivers/net/b44.o \
-,CONFIG_B44))
-$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
-	$(MODULES_DIR)/kernel/net/bluetooth/*.o \
-	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \
-	$(MODULES_DIR)/kernel/drivers/bluetooth/*.o \
-,CONFIG_BLUEZ))
 $(eval $(call KMOD_template,ARPT,arptables,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \
 ,CONFIG_IP_NF_ARPTABLES))
@@ -83,56 +72,6 @@ $(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\
 $(eval $(call KMOD_template,IPV6,ipv6,\
 	$(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
 ,CONFIG_IPV6,,20,ipv6))
-$(eval $(call KMOD_template,CIFS,cifs,\
-	$(MODULES_DIR)/kernel/fs/cifs/cifs.o \
-,CONFIG_CIFS,,30,cifs))
-$(eval $(call KMOD_template,NFS,nfs,\
-	$(MODULES_DIR)/kernel/fs/lockd/*.o \
-	$(MODULES_DIR)/kernel/fs/nfs/*.o \
-	$(MODULES_DIR)/kernel/net/sunrpc/*.o \
-,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
-$(eval $(call KMOD_template,SOUNDCORE,soundcore,\
-	$(MODULES_DIR)/kernel/drivers/sound/soundcore.o \
-,CONFIG_SOUND,,30,soundcore))
-$(eval $(call KMOD_template,USB,usb-core,\
-	$(MODULES_DIR)/kernel/drivers/usb/usbcore.o \
-,CONFIG_USB,,50,usbcore))
-$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
-,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
-$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
-,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci))
-$(eval $(call KMOD_template,USB2,usb2,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
-,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
-
-$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.o \
-,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial))
-$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.o \
-,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa))
-$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \
-,CONFIG_USB_SERIAL_IR,kmod-usb-serial,61,ftdi_usb))
-$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \
-,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232))
-$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.o \
-,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303))
-
-$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
-	$(MODULES_DIR)/kernel/drivers/scsi/*.o \
-	$(MODULES_DIR)/kernel/drivers/usb/storage/*.o \
-,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
-$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
-	$(MODULES_DIR)/kernel/drivers/usb/printer.o \
-,CONFIG_USB_PRINTER,kmod-usb-core,60,printer))
-$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
-	$(MODULES_DIR)/kernel/drivers/usb/audio.o \
-,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
 $(eval $(call KMOD_template,IDE,ide,\
 	$(MODULES_DIR)/kernel/drivers/ide/*.o \
 	$(MODULES_DIR)/kernel/drivers/ide/*/*.o \
@@ -140,23 +79,7 @@ $(eval $(call KMOD_template,IDE,ide,\
 $(eval $(call KMOD_template,LOOP,loop,\
     $(MODULES_DIR)/kernel/drivers/block/loop.o \
 ,CONFIG_BLK_DEV_LOOP,,20,loop))
-$(eval $(call KMOD_template,EXT2,ext2,\
-	$(MODULES_DIR)/kernel/fs/ext2/*.o \
-,CONFIG_EXT2_FS,,30,ext2))
-$(eval $(call KMOD_template,EXT3,ext3,\
-	$(MODULES_DIR)/kernel/fs/ext3/*.o \
-	$(MODULES_DIR)/kernel/fs/jbd/*.o \
-,CONFIG_EXT3_FS,,30,jbd ext3))
-$(eval $(call KMOD_template,XFS,xfs,\
-	$(MODULES_DIR)/kernel/fs/xfs/*.o \
-,CONFIG_XFS_FS,,30,xfs))
-$(eval $(call KMOD_template,HFSPLUS,hfsplus,\
-	$(MODULES_DIR)/kernel/fs/hfsplus/*.o \
-,CONFIG_HFSPLUS_FS,,30,hfsplus))
-$(eval $(call KMOD_template,VFAT,vfat,\
-	$(MODULES_DIR)/kernel/fs/vfat/vfat.o \
-	$(MODULES_DIR)/kernel/fs/fat/fat.o \
-,CONFIG_VFAT_FS,,30,fat vfat))
+
 ifneq ($(wildcard $(MODULES_DIR)/kernel/crypto/*.o),)
 CONFIG_CRYPTO:=m
 endif
@@ -188,18 +111,58 @@ $(eval $(call KMOD_template,SCHED,sched,\
 	$(MODULES_DIR)/kernel/net/sched/*.o \
 ,CONFIG_SCHED))
 
-$(eval $(call KMOD_template,VIDEODEV,videodev,\
-	$(MODULES_DIR)/kernel/drivers/media/video/videodev.o \
-,CONFIG_VIDEO_DEV,,62,videodev))
+
+# Filesystems
+
+$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\
+	$(MODULES_DIR)/kernel/fs/cifs/cifs.o \
+,CONFIG_CIFS,,30,cifs))
+
+$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\
+	$(MODULES_DIR)/kernel/fs/ext2/*.o \
+,CONFIG_EXT2_FS,,30,ext2))
+
+$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\
+	$(MODULES_DIR)/kernel/fs/ext3/*.o \
+	$(MODULES_DIR)/kernel/fs/jbd/*.o \
+,CONFIG_EXT3_FS,,30,jbd ext3))
+
+$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\
+	$(MODULES_DIR)/kernel/fs/hfsplus/*.o \
+,CONFIG_HFSPLUS_FS,,30,hfsplus))
+
+$(eval $(call KMOD_template,FS_NFS,fs-nfs,\
+	$(MODULES_DIR)/kernel/fs/lockd/*.o \
+	$(MODULES_DIR)/kernel/fs/nfs/*.o \
+	$(MODULES_DIR)/kernel/net/sunrpc/*.o \
+,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
+
+$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\
+	$(MODULES_DIR)/kernel/fs/vfat/vfat.o \
+	$(MODULES_DIR)/kernel/fs/fat/fat.o \
+,CONFIG_VFAT_FS,,30,fat vfat))
+
+$(eval $(call KMOD_template,FS_XFS,fs-xfs,\
+	$(MODULES_DIR)/kernel/fs/xfs/*.o \
+,CONFIG_XFS_FS,,30,xfs))
+
+
+# Multimedia
 
 $(eval $(call KMOD_template,PWC,pwc,\
 	$(MODULES_DIR)/kernel/drivers/usb/pwc.o \
 ,CONFIG_USB_PWC,kmod-videodev,63,pwc))
 
-$(eval $(call KMOD_template,AX25,ax25,\
-	$(MODULES_DIR)/kernel/net/ax25/ax25.o \
-	$(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.o \
-,CONFIG_AX25,,90,ax25 mkiss))
+$(eval $(call KMOD_template,SOUNDCORE,soundcore,\
+	$(MODULES_DIR)/kernel/drivers/sound/soundcore.o \
+,CONFIG_SOUND,,30,soundcore))
+
+$(eval $(call KMOD_template,VIDEODEV,videodev,\
+	$(MODULES_DIR)/kernel/drivers/media/video/videodev.o \
+,CONFIG_VIDEO_DEV,,62,videodev))
+
+
+# Network devices
 
 $(eval $(call KMOD_template,NET_3C59X,net-3c59x,\
 	$(MODULES_DIR)/kernel/drivers/net/3c59x.o \
@@ -214,6 +177,10 @@ $(eval $(call KMOD_template,NET_AIRO,net-airo,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \
 ,CONFIG_AIRO,,10,airo))
 
+$(eval $(call KMOD_template,NET_B44,net-b44,\
+	$(MODULES_DIR)/kernel/drivers/net/b44.o \
+,CONFIG_B44,,10,b44))
+
 $(eval $(call KMOD_template,NET_HERMES,net-hermes,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \
 	$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \
@@ -235,6 +202,77 @@ $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \
 ,CONFIG_PRISM54,,10,prism54))
 
+
+# USB
+
+$(eval $(call KMOD_template,USB,usb-core,\
+	$(MODULES_DIR)/kernel/drivers/usb/usbcore.o \
+,CONFIG_USB,,50,usbcore))
+
+$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
+,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
+
+$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
+,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci))
+
+$(eval $(call KMOD_template,USB2,usb2,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
+,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
+
+$(eval $(call KMOD_template,USB_ACM,usb-acm,\
+	$(MODULES_DIR)/kernel/drivers/usb/acm.o \
+,CONFIG_USB_ACM))
+
+$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
+	$(MODULES_DIR)/kernel/drivers/usb/audio.o \
+,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
+
+$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
+	$(MODULES_DIR)/kernel/drivers/usb/printer.o \
+,CONFIG_USB_PRINTER,kmod-usb-core,60,printer))
+
+$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
+	$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.o \
+,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial))
+
+$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
+	$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.o \
+,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa))
+
+$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
+	$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \
+,CONFIG_USB_SERIAL_IR,kmod-usb-serial,61,ftdi_usb))
+
+$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
+	$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \
+,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232))
+
+$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
+	$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.o \
+,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303))
+
+$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
+	$(MODULES_DIR)/kernel/drivers/scsi/*.o \
+	$(MODULES_DIR)/kernel/drivers/usb/storage/*.o \
+,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
+
+
+# Misc. devices
+
+$(eval $(call KMOD_template,AX25,ax25,\
+	$(MODULES_DIR)/kernel/net/ax25/ax25.o \
+	$(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.o \
+,CONFIG_AX25,,90,ax25 mkiss))
+
+$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
+	$(MODULES_DIR)/kernel/net/bluetooth/*.o \
+	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \
+	$(MODULES_DIR)/kernel/drivers/bluetooth/*.o \
+,CONFIG_BLUEZ))
+
+
 $(TARGETS): $(PACKAGE_DIR)
 
 $(PACKAGE_DIR):
diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile
index 5516240ce6..0d4bcea779 100644
--- a/openwrt/target/linux/linux-2.6/Makefile
+++ b/openwrt/target/linux/linux-2.6/Makefile
@@ -54,17 +54,6 @@ $(eval $(call KMOD_template,ATM,atm,\
 $(eval $(call KMOD_template,PPPOATM,pppoatm,\
 	$(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
 ,CONFIG_PPPOATM))
-$(eval $(call KMOD_template,USB_ACM,usb-acm,\
-	$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
-,CONFIG_USB_ACM))
-$(eval $(call KMOD_template,B44,b44,\
-	$(MODULES_DIR)/kernel/drivers/net/b44.ko \
-,CONFIG_B44))
-$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
-	$(MODULES_DIR)/kernel/net/bluetooth/*.ko \
-	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.ko \
-	$(MODULES_DIR)/kernel/drivers/bluetooth/*.ko \
-,CONFIG_BLUEZ))
 $(eval $(call KMOD_template,ARPT,arptables,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \
 ,CONFIG_IP_NF_ARPTABLES))
@@ -80,33 +69,6 @@ $(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\
 $(eval $(call KMOD_template,IPV6,ipv6,\
 	$(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \
 ,CONFIG_IPV6,,20,ipv6))
-$(eval $(call KMOD_template,CIFS,cifs,\
-	$(MODULES_DIR)/kernel/fs/cifs/cifs.ko \
-,CONFIG_CIFS,,30,cifs))
-$(eval $(call KMOD_template,NFS,nfs,\
-	$(MODULES_DIR)/kernel/fs/lockd/*.ko \
-	$(MODULES_DIR)/kernel/fs/nfs/*.ko \
-	$(MODULES_DIR)/kernel/net/sunrpc/*.ko \
-,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
-$(eval $(call KMOD_template,USB,usb-core,\
-	$(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \
-,CONFIG_USB,,50,usbcore))
-$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/uhci.ko \
-,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
-$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \
-,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd))
-$(eval $(call KMOD_template,USB2,usb2,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \
-,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
-$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
-	$(MODULES_DIR)/kernel/drivers/scsi/*.ko \
-	$(MODULES_DIR)/kernel/drivers/usb/storage/*.ko \
-,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
-$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
-	$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
-,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp))
 $(eval $(call KMOD_template,IDE,ide,\
 	$(MODULES_DIR)/kernel/drivers/ide/*.ko \
 	$(MODULES_DIR)/kernel/drivers/ide/*/*.ko \
@@ -114,39 +76,6 @@ $(eval $(call KMOD_template,IDE,ide,\
 $(eval $(call KMOD_template,LOOP,loop,\
     $(MODULES_DIR)/kernel/drivers/block/loop.ko \
 ,CONFIG_BLK_DEV_LOOP,,20,loop))
-$(eval $(call KMOD_template,EXT2,ext2,\
-	$(MODULES_DIR)/kernel/fs/ext2/*.ko \
-,CONFIG_EXT2_FS,,30,ext2))
-$(eval $(call KMOD_template,EXT3,ext3,\
-	$(MODULES_DIR)/kernel/fs/ext3/*.ko \
-	$(MODULES_DIR)/kernel/fs/jbd/*.ko \
-,CONFIG_EXT3_FS,,30,jbd ext3))
-$(eval $(call KMOD_template,XFS,xfs,\
-	$(MODULES_DIR)/kernel/fs/xfs/*.ko \
-,CONFIG_XFS_FS,,30,xfs))
-$(eval $(call KMOD_template,HFSPLUS,hfsplus,\
-	$(MODULES_DIR)/kernel/fs/hfsplus/*.ko \
-,CONFIG_HFSPLUS_FS,,30,hfsplus))
-$(eval $(call KMOD_template,VFAT,vfat,\
-	$(MODULES_DIR)/kernel/fs/vfat/vfat.ko \
-	$(MODULES_DIR)/kernel/fs/fat/fat.ko \
-	$(MODULES_DIR)/kernel/fs/nls/nls_base.ko \
-,CONFIG_VFAT_FS,,30,fat vfat))
-$(eval $(call KMOD_template,NLS_BASE,nls-base,\
-	$(MODULES_DIR)/kernel/fs/nls/nls_base.ko \
-,CONFIG_NLS,,20,nls_base))
-$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\
-	$(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \
-,CONFIG_NLS_UTF8,,20,nls_utf8))
-$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\
-	$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \
-,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1))
-$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\
-	$(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \
-,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437))
-$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\
-	$(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \
-,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850))
 $(eval $(call KMOD_template,CRYPTO,crypto,\
 	$(MODULES_DIR)/kernel/crypto/*.ko \
 ))
@@ -172,6 +101,117 @@ $(eval $(call KMOD_template,SCHED,sched,\
 	$(MODULES_DIR)/kernel/net/sched/*.ko \
 ))
 
+
+# Filesystems
+
+$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\
+	$(MODULES_DIR)/kernel/fs/cifs/cifs.ko \
+,CONFIG_CIFS,kmod-nls-base,30,cifs))
+
+$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\
+	$(MODULES_DIR)/kernel/fs/ext2/*.ko \
+,CONFIG_EXT2_FS,,30,ext2))
+
+$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\
+	$(MODULES_DIR)/kernel/fs/ext3/*.ko \
+	$(MODULES_DIR)/kernel/fs/jbd/*.ko \
+,CONFIG_EXT3_FS,,30,jbd ext3))
+
+$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\
+	$(MODULES_DIR)/kernel/fs/hfsplus/*.ko \
+,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus))
+
+$(eval $(call KMOD_template,FS_NFS,fs-nfs,\
+	$(MODULES_DIR)/kernel/fs/lockd/*.ko \
+	$(MODULES_DIR)/kernel/fs/nfs/*.ko \
+	$(MODULES_DIR)/kernel/net/sunrpc/*.ko \
+,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
+
+$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\
+	$(MODULES_DIR)/kernel/fs/fat/fat.ko \
+	$(MODULES_DIR)/kernel/fs/vfat/vfat.ko \
+,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat))
+
+$(eval $(call KMOD_template,FS_XFS,fs-xfs,\
+	$(MODULES_DIR)/kernel/fs/xfs/*.ko \
+,CONFIG_XFS_FS,,30,xfs))
+
+
+# NLS
+
+$(eval $(call KMOD_template,NLS_BASE,nls-base,\
+	$(MODULES_DIR)/kernel/fs/nls/nls_base.ko \
+,CONFIG_NLS,,20,nls_base))
+
+$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\
+	$(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \
+,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437))
+
+$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\
+	$(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \
+,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850))
+
+$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\
+	$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \
+,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1))
+
+$(eval $(call KMOD_template,NLS_ISO8859_15,nls-iso8859-15,\
+	$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.ko \
+,CONFIG_NLS_ISO8859_15,,20,nls_iso8859-15))
+
+$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\
+	$(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \
+,CONFIG_NLS_UTF8,,20,nls_utf8))
+
+
+# Network devices
+
+$(eval $(call KMOD_template,NET_B44,net-b44,\
+	$(MODULES_DIR)/kernel/drivers/net/b44.ko \
+,CONFIG_B44))
+
+
+# USB
+
+$(eval $(call KMOD_template,USB,usb-core,\
+	$(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \
+,CONFIG_USB,,50,usbcore))
+
+$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \
+,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd))
+
+$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/uhci.ko \
+,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
+
+$(eval $(call KMOD_template,USB2,usb2,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \
+,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
+
+$(eval $(call KMOD_template,USB_ACM,usb-acm,\
+	$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
+,CONFIG_USB_ACM))
+
+$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
+	$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
+,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp))
+
+$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
+	$(MODULES_DIR)/kernel/drivers/scsi/*.ko \
+	$(MODULES_DIR)/kernel/drivers/usb/storage/*.ko \
+,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
+
+
+# Misc.
+
+$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
+	$(MODULES_DIR)/kernel/net/bluetooth/*.ko \
+	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.ko \
+	$(MODULES_DIR)/kernel/drivers/bluetooth/*.ko \
+,CONFIG_BLUEZ))
+
+
 $(TARGETS): $(PACKAGE_DIR)
 
 $(PACKAGE_DIR):
diff --git a/openwrt/target/linux/package/alsa/Config.in b/openwrt/target/linux/package/alsa/Config.in
index 5396542d10..b8cabe2802 100644
--- a/openwrt/target/linux/package/alsa/Config.in
+++ b/openwrt/target/linux/package/alsa/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KMOD_ALSA
-	prompt "kmod-alsa - Alsa Sound Drivers"
-	tristate
+	tristate "kmod-alsa...................... Alsa Sound Drivers"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 	select BR2_PACKAGE_KMOD_SOUNDCORE
diff --git a/openwrt/target/linux/package/diag/Config.in b/openwrt/target/linux/package/diag/Config.in
index b58a99e62f..b68a0ee094 100644
--- a/openwrt/target/linux/package/diag/Config.in
+++ b/openwrt/target/linux/package/diag/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_KMOD_DIAG
-	tristate "kmod-diag"
+	tristate "kmod-diag...................... Driver for router LEDs and Buttons"
 	default y
 	help
 	  Driver for router LEDs and Buttons
diff --git a/openwrt/target/linux/package/fuse/Config.in b/openwrt/target/linux/package/fuse/Config.in
index 7e575074f5..4e87aaa854 100644
--- a/openwrt/target/linux/package/fuse/Config.in
+++ b/openwrt/target/linux/package/fuse/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KMOD_FUSE
-	prompt "kmod-fuse - FUSE kernel module"
-	tristate
+	tristate "kmod-fuse...................... FUSE kernel module"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_FUSE
 	help
diff --git a/openwrt/target/linux/package/hostap/Config.in b/openwrt/target/linux/package/hostap/Config.in
index 539e9438ef..56286b400c 100644
--- a/openwrt/target/linux/package/hostap/Config.in
+++ b/openwrt/target/linux/package/hostap/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KMOD_HOSTAP
-	prompt "kmod-hostap - Host AP support for Prism2/2.5/3 IEEE 802.11b"
-	tristate
+	tristate "kmod-hostap.................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
 	default m if CONFIG_DEVEL
 	help
 	  A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
@@ -17,8 +16,7 @@ config BR2_PACKAGE_KMOD_HOSTAP
 	  
 
 config BR2_PACKAGE_KMOD_HOSTAP_PCI
-	prompt "kmod-hostap-pci - Host AP driver for Prism2.5 PCI adaptors"
-	tristate
+	tristate   "kmod-hostap-pci.............. Host AP driver for Prism2.5 PCI adaptors"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_HOSTAP
 	help
@@ -32,8 +30,7 @@ config BR2_PACKAGE_KMOD_HOSTAP_PCI
 	  
 
 config BR2_PACKAGE_KMOD_HOSTAP_PLX
-	prompt "kmod-hostap-plx - Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
-	tristate
+	tristate   "kmod-hostap-plx.............. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_HOSTAP
 	help
diff --git a/openwrt/target/linux/package/madwifi/Config.in b/openwrt/target/linux/package/madwifi/Config.in
index cf3ec9fb91..ad7ef4af29 100644
--- a/openwrt/target/linux/package/madwifi/Config.in
+++ b/openwrt/target/linux/package/madwifi/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KMOD_MADWIFI
-	prompt "kmod-madwifi - Atheros Wifi driver"
-	tristate
+	tristate "kmod-madwifi................... Atheros Wifi driver"
 	default m if CONFIG_DEVEL
 	help
 	  Driver for Atheros 802.11a/b/g MiniPCI cards
diff --git a/openwrt/target/linux/package/mini_fo/Config.in b/openwrt/target/linux/package/mini_fo/Config.in
index 8b9b59508a..2f1b681340 100644
--- a/openwrt/target/linux/package/mini_fo/Config.in
+++ b/openwrt/target/linux/package/mini_fo/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KMOD_MINI_FO
-	prompt "kmod-mini_fo - mini fanout overlay file system"
-	tristate
+	tristate "kmod-mini_fo................... mini fanout overlay file system"
 	default m if CONFIG_DEVEL
 	help
 	  The mini fanout overlay file system.
diff --git a/openwrt/target/linux/package/openswan/Config.in b/openwrt/target/linux/package/openswan/Config.in
index 0746197e19..46fff10497 100644
--- a/openwrt/target/linux/package/openswan/Config.in
+++ b/openwrt/target/linux/package/openswan/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_KMOD_OPENSWAN
-	tristate "kmod-openswan Openswan kernel module"
+	tristate "kmod-openswan.................. Openswan kernel module"
 	default m if CONFIG_DEVEL
 	help
 	  Openswan is an implementation of IPsec for Linux.
diff --git a/openwrt/target/linux/package/shfs/Config.in b/openwrt/target/linux/package/shfs/Config.in
index 8d30c8c031..3718cd74d8 100644
--- a/openwrt/target/linux/package/shfs/Config.in
+++ b/openwrt/target/linux/package/shfs/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KMOD_SHFS
-	prompt "kmod-shfs - Shell FileSystem kernel module (ShFS) kernel module"
-	tristate
+	tristate "kmod-shfs...................... Shell FileSystem kernel module (ShFS) kernel module"
 	default m if CONFIG_DEVEL
 	help
 	  ShFS is a simple and easy to use Linux kernel module which 
diff --git a/openwrt/target/linux/package/wlcompat/Config.in b/openwrt/target/linux/package/wlcompat/Config.in
index 5958eeb899..a157c07975 100644
--- a/openwrt/target/linux/package/wlcompat/Config.in
+++ b/openwrt/target/linux/package/wlcompat/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_KMOD_WLCOMPAT
-	tristate "kmod-wlcompat"
+	tristate "kmod-wlcompat.................. Wrapper providing Wireless Extensions for Broadcom wl module"
 	default y
 	depends BR2_PACKAGE_KMOD_BRCM_WL
 	help
@@ -7,7 +7,7 @@ config BR2_PACKAGE_KMOD_WLCOMPAT
 	  proprietary Broadcom wl module.
 
 config BR2_PACKAGE_KMOD_WLCOMPAT_DEBUG
-	tristate "kmod-wlcompat-debug"
+	tristate "kmod-wlcompat-debug............ Wrapper providing Wireless Extensions for Broadcom wl module (debug)"
 	default m
 	depends BR2_PACKAGE_KMOD_BRCM_WL
 	help