cosmetic fixes: rearrange KernelPackage definitions

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

8 files changed, 438 insertions, 220 deletions

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 72e032ffa7..c8a8f9040f 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -1,6 +1,7 @@
 BLMENU:=Block Devices
 
 define KernelPackage/ide-core
+  SUBMENU:=$(BLMENU)
   TITLE:=Kernel support for IDE
   DESCRIPTION:=\
 	Useful for usb mass storage devices (e.g. on WL-HDD)\\\
@@ -10,8 +11,8 @@ define KernelPackage/ide-core
 	- ide-detect \\\
 	- ide-disk
   KCONFIG:=CONFIG_IDE CONFIG_BLK_DEV_IDE CONFIG_IDE_GENERIC CONFIG_BLK_DEV_IDEDISK
-  SUBMENU:=$(BLMENU)
 endef
+
 define KernelPackage/ide-core/2.4
   FILES:= \
 	$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
@@ -19,6 +20,7 @@ define KernelPackage/ide-core/2.4
 	$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
 endef
+
 define KernelPackage/ide-core/2.6
   FILES:= \
 	$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
@@ -26,67 +28,78 @@ define KernelPackage/ide-core/2.6
 	$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-disk)
 endef
+
 $(eval $(call KernelPackage,ide-core))
 
+
 define KernelPackage/ide-pdc202xx
-  TITLE:=PDC202xx IDE driver
   SUBMENU:=$(BLMENU)
+  TITLE:=PDC202xx IDE driver
   DEPENDS:=@LINUX_2_4
   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
   FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
 endef
+
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+
 define KernelPackage/ide-aec62xx
-  TITLE:=AEC62xx IDE driver
   SUBMENU:=$(BLMENU)
+  TITLE:=AEC62xx IDE driver
   KCONFIG:=CONFIG_BLK_DEV_AEC62XX
   FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,aec62xx)
 endef
+
 $(eval $(call KernelPackage,ide-aec62xx))
 
+
 define KernelPackage/scsi-core
-  TITLE:=Kernel support for SCSI
   SUBMENU:=$(BLMENU)
+  TITLE:=Kernel support for SCSI
   KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
   FILES:= \
     $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
     $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,scsi-core))
 
+
 define KernelPackage/libata
-	TITLE:=libata
-	DESCRIPTION:=libata
-	KCONFIG:=CONFIG_ATA
-	SUBMENU:=$(BLMENU)
-	FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
-	DEPENDS:=@PCI_SUPPORT @LINUX_2_6
+  SUBMENU:=$(BLMENU)
+  TITLE:=libata
+  DESCRIPTION:=libata
+  DEPENDS:=@PCI_SUPPORT @LINUX_2_6
+  KCONFIG:=CONFIG_ATA
+  FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,libata))
 
+
 define KernelPackage/ata-piix
-	TITLE:=ata-piix
-	DESCRIPTION:=Kernel module for Intel PIIX SATA controller
-	KCONFIG:=CONFIG_ATA_PIIX
-	SUBMENU:=$(BLMENU)
-	AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
-	FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
-	DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
+  SUBMENU:=$(BLMENU)
+  TITLE:=ata-piix
+  DESCRIPTION:=Kernel module for Intel PIIX SATA controller
+  DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
+  KCONFIG:=CONFIG_ATA_PIIX
+  FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
 endef
+
 $(eval $(call KernelPackage,ata-piix))
 
+
 define KernelPackage/pata-artop
-	TITLE:=pata-artop
-	DESCRIPTION:=Kernel module for ARTOP PATA controller
-	KCONFIG:=CONFIG_PATA_ARTOP
-	SUBMENU:=$(BLMENU)
-	AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
-	FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
-	DEPENDS:=kmod-libata +kmod-scsi-core
+  SUBMENU:=$(BLMENU)
+  TITLE:=pata-artop
+  DESCRIPTION:=Kernel module for ARTOP PATA controller
+  DEPENDS:=kmod-libata +kmod-scsi-core
+  KCONFIG:=CONFIG_PATA_ARTOP
+  FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
 endef
-$(eval $(call KernelPackage,pata-artop))
-
 
+$(eval $(call KernelPackage,pata-artop))
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index aaaf62df4d..dc4e397bd0 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,142 +1,161 @@
 FSMENU:=Filesystems
 
 define KernelPackage/fs-cifs
+  SUBMENU:=$(FSMENU)
   TITLE:=CIFS support
   DESCRIPTION:=Kernel module for CIFS support
-  KCONFIG:=CONFIG_CIFS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,cifs)
+  KCONFIG:=CONFIG_CIFS
   FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,cifs)
 endef
 
 define KernelPackage/fs-cifs/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-cifs))
 
+
 define KernelPackage/fs-minix
+  SUBMENU:=$(FSMENU)
   TITLE:=Minix filesystem support
   DESCRIPTION:=Kernel module for Minix filesystem support
   KCONFIG:=CONFIG_MINIX_FS
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,minix)
   FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,minix)
 endef
+
 $(eval $(call KernelPackage,fs-minix))
 
+
 define KernelPackage/fs-ntfs
+  SUBMENU:=$(FSMENU)
   TITLE:=NTFS filesystem support
   DESCRIPTION:=Kernel module for NTFS filesystem support
   KCONFIG:=CONFIG_NTFS_FS
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,ntfs)
   FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ntfs)
 endef
+
 $(eval $(call KernelPackage,fs-ntfs))
 
+
 define KernelPackage/fs-ext2
+  SUBMENU:=$(FSMENU)
   TITLE:=EXT2 filesystem support
   DESCRIPTION:=Kernel module for EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,ext2)
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ext2)
 endef
+
 $(eval $(call KernelPackage,fs-ext2))
 
+
 define KernelPackage/fs-ext3
+  SUBMENU:=$(FSMENU)
   TITLE:=EXT3 filesystem support
   DESCRIPTION:=Kernel module for EXT3 filesystem support
   KCONFIG:=CONFIG_EXT3_FS
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
   FILES:= \
 	$(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
 endef
+
 $(eval $(call KernelPackage,fs-ext3))
 
+
 define KernelPackage/fs-hfs
+  SUBMENU:=$(FSMENU)
   TITLE:=HFS+ filesystem support
   DESCRIPTION:=Kernel module for HFS filesystem support
-  KCONFIG:=CONFIG_HFS_FS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,hfs)
+  KCONFIG:=CONFIG_HFS_FS
   FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,hfs)
 endef
+
 define KernelPackage/fs-hfs/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-hfs))
 
 
 define KernelPackage/fs-hfsplus
+  SUBMENU:=$(FSMENU)
   TITLE:=HFS+ filesystem support
   DESCRIPTION:=Kernel module for HFS+ filesystem support
-  KCONFIG:=CONFIG_HFSPLUS_FS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,hfsplus)
+  KCONFIG:=CONFIG_HFSPLUS_FS
   FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,hfsplus)
 endef
 
 define KernelPackage/fs-hfsplus/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-hfsplus))
 
+
 define KernelPackage/fs-isofs
+  SUBMENU:=$(FSMENU)
   TITLE:=ISO9660 filesystem support
   DESCRIPTION:=Kernel module for ISO9660 filesystem support
-  KCONFIG:=CONFIG_ISO9660_FS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,isofs)
+  KCONFIG:=CONFIG_ISO9660_FS
   FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,isofs)
 endef
 
 define Kernel/Package/fs-isofs/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-isofs))
 
+
 define KernelPackage/fs-udf
+  SUBMENU:=$(FSMENU)
   TITLE:=UDF filesystem support
   DESCRIPTION:=Kernel module for UDF filesystem support
-  KCONFIG:=CONFIG_UDF_FS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,udf)
+  KCONFIG:=CONFIG_UDF_FS
   FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,udf)
 endef
 
 define KernelPackage/fs-udf/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-udf))
 
+
 define KernelPackage/fs-nfs
+  SUBMENU:=$(FSMENU)
   TITLE:=NFS filesystem support
   DESCRIPTION:=Kernel module for NFS support
   KCONFIG:=CONFIG_NFS_FS
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
   FILES:= \
   	$(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
   	$(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
   	$(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
 endef
+
 $(eval $(call KernelPackage,fs-nfs))
 
+
 define KernelPackage/fs-nfsd
+  SUBMENU:=$(FSMENU)
   TITLE:=NFS kernel server support
   DESCRIPTION:=Kernel module for NFS kernel server support
   KCONFIG:=CONFIG_NFSD
-  SUBMENU:=$(FSMENU)
-  FILES:= \
-  	$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
 endef
 
 define KernelPackage/fs-nfsd/2.4
@@ -150,57 +169,60 @@ endef
 
 $(eval $(call KernelPackage,fs-nfsd))
 
+
 define KernelPackage/fs-msdos
+  SUBMENU:=$(FSMENU)
   TITLE:=MSDOS filesystem support
   DESCRIPTION:=Kernel module for MSDOS filesystem support
-  KCONFIG:=CONFIG_MSDOS_FS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_MSDOS_FS
+  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,msdos)
-  FILES:= \
-	$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
 endef
 
 define KernelPackage/fs-msdos/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-msdos))
 
+
 define KernelPackage/fs-vfat
+  SUBMENU:=$(FSMENU)
   TITLE:=VFAT filesystem support
   DESCRIPTION:=Kernel module for VFAT filesystem support
-  KCONFIG:=CONFIG_VFAT_FS
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,fat vfat)
+  KCONFIG:=CONFIG_VFAT_FS
   FILES:= \
 	$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,fat vfat)
 endef
 
 define KernelPackage/fs-vfat/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,fs-vfat))
 
+
 define KernelPackage/fs-xfs
+  SUBMENU:=$(FSMENU)
   TITLE:=XFS filesystem support
   DESCRIPTION:=Kernel module for XFS support
   KCONFIG:=CONFIG_XFS_FS
-  SUBMENU:=$(FSMENU)
+  FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
-  FILES:= \
-  	$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,fs-xfs))
 
 
 define KernelPackage/nls-base
+  SUBMENU:=$(FSMENU)
   TITLE:=Native Language Support
   DESCRIPTION:=Kernel module for Native Language Support
   KCONFIG:=CONFIG_NLS
-  SUBMENU:=$(FSMENU)
-  MENU:=1
   FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,nls_base)
 endef
@@ -208,11 +230,11 @@ $(eval $(call KernelPackage,nls-base))
 
 
 define KernelPackage/nls-cp437
+  SUBMENU:=$(FSMENU)
   TITLE:=Codepage 437 (United States, Canada)
   DESCRIPTION:=Kernel module for NLS Codepage 437 (United States, Canada)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_437
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_437
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
 endef
@@ -220,15 +242,16 @@ endef
 define KernelPackage/nfs-c437/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-cp437))
 
 
 define KernelPackage/nls-cp850
+  SUBMENU:=$(FSMENU)
   TITLE:=Codepage 850 (Europe)
   DESCRIPTION:=Kernel module for NLS Codepage 850 (Europe)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_850
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_850
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
 endef
@@ -236,14 +259,16 @@ endef
 define KernelPackage/nls-cp850/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-cp850))
 
+
 define KernelPackage/nls-cp1250
+  SUBMENU:=$(FSMENU)
   TITLE:=Codepage 1250 (Eastern Europe)
   DESCRIPTION:=Kernel module for NLS Codepage 1250 (Eastern Europe)
-  KCONFIG:=CONFIG_NLS_CODEPAGE_1250
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_1250
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
 endef
@@ -251,14 +276,16 @@ endef
 define KernelPackage/nls-cp1250/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-cp1250))
 
+
 define KernelPackage/nls-iso8859-1
+  SUBMENU:=$(FSMENU)
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
   DESCRIPTION:=Kernel module for ISO 8859-1 (Latin 1)
-  KCONFIG:=CONFIG_NLS_ISO8859_1
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_ISO8859_1
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
 endef
@@ -266,14 +293,16 @@ endef
 define KernelPackage/nls-iso8859-1/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-iso8859-1))
 
+
 define KernelPackage/nls-iso8859-2
+  SUBMENU:=$(FSMENU)
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
   DESCRIPTION:=Kernel module for ISO 8859-2 (Latin 2)
-  KCONFIG:=CONFIG_NLS_ISO8859_2
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_ISO8859_2
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
 endef
@@ -281,14 +310,16 @@ endef
 define KernelPackage/nls-iso8859-2/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-iso8859-2))
 
+
 define KernelPackage/nls-iso8859-15
+  SUBMENU:=$(FSMENU)
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
   DESCRIPTION:=Kernel module for ISO 8859-15 (Latin 9)
-  KCONFIG:=CONFIG_NLS_ISO8859_15
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_ISO8859_15
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
 endef
@@ -296,14 +327,16 @@ endef
 define KernelPackage/nls-iso8859-15/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-iso8859-15))
 
+
 define KernelPackage/nls-koi8r
+  SUBMENU:=$(FSMENU)
   TITLE:=KOI8-R (Russian)
   DESCRIPTION:=Kernel module for KOI8-R (Russian)
-  KCONFIG:=CONFIG_NLS_KOI8_R
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_KOI8_R
   FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
 endef
@@ -311,14 +344,16 @@ endef
 define KernelPackage/nls-koi8r/2.4
   DEPENDS:=
 endef
+
 $(eval $(call KernelPackage,nls-koi8r))
 
+
 define KernelPackage/nls-utf8
+  SUBMENU:=$(FSMENU)
   TITLE:=UTF8
   DESCRIPTION:=Kernel module for NLS UTF8
-  KCONFIG:=CONFIG_NLS_UTF8
   DEPENDS:=+kmod-nls-base
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_NLS_UTF8
   FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
 endef
@@ -326,6 +361,5 @@ endef
 define KernelPackage/nls-utf8/2.4
   DEPENDS:=
 endef
-$(eval $(call KernelPackage,nls-utf8))
-
 
+$(eval $(call KernelPackage,nls-utf8))
diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index 441e0fff1e..00bd60e302 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -9,36 +9,42 @@
 I2CMENU:=I2C Bus
 
 define KernelPackage/i2c-core
+  SUBMENU:=$(I2CMENU)
   TITLE:=I2C support
   DESCRIPTION:=Kernel modules for i2c support
   DEPENDS:=@LINUX_2_6
-  SUBMENU:=$(I2CMENU)
   KCONFIG:=CONFIG_I2C
   FILES:=$(LINUX_DIR)/drivers/i2c/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,i2c-core i2c-dev)
 endef
+
 $(eval $(call KernelPackage,i2c-core))
 
+
 define KernelPackage/i2c-algos
+  SUBMENU:=$(I2CMENU)
   TITLE:=I2C algorithms support
   DESCRIPTION:=Kernel modules for various i2c algorithms
   DEPENDS:=kmod-i2c-core
-  SUBMENU:=$(I2CMENU)
   KCONFIG:=CONFIG_I2C_ALGOBIT
   FILES:=$(LINUX_DIR)/drivers/i2c/algos/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,i2c-algo-bit i2c-algo-pcf i2c-algo-pca)
 endef
+
 $(eval $(call KernelPackage,i2c-algos))
 
+
 define KernelPackage/i2c-scx200
+  SUBMENU:=$(I2CMENU)
   TITLE:=SCX200 i2c support
   DESCRIPTION:=Kernel module for SCX200 i2c bus
   DEFAULT:=y if LINUX_2_6_X86_Soekris
   DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_X86_Soekris
-  SUBMENU:=$(I2CMENU)
   KCONFIG:=CONFIG_SCx200_I2C
-  FILES:=$(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \
+  FILES:= \
+	$(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,i2c-isa scx200_i2c)
 endef
+
 $(eval $(call KernelPackage,i2c-scx200))
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index a25dbdef7a..94c715216f 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -10,6 +10,7 @@ NFMENU:=Netfilter Extensions
 include $(INCLUDE_DIR)/netfilter.mk
 
 define KernelPackage/ipt-conntrack
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for connection tracking
   DESCRIPTION:=\
 	Netfilter (IPv4) kernel modules for connection tracking\\\
@@ -20,12 +21,14 @@ define KernelPackage/ipt-conntrack
 	- ipt_connmark/CONNMARK
   KCONFIG:=$(KCONFIG_IPT_CONNTRACK)
   FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-conntrack))
 
+
 define KernelPackage/ipt-filter
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for packet content inspection
   DESCRIPTION:=\
 	Netfilter (IPv4) kernel modules for packet content inspection \\\
@@ -35,12 +38,14 @@ define KernelPackage/ipt-filter
 	- ipt_layer7
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-filter))
 
+
 define KernelPackage/ipt-ipopt
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for matching/changing IP packet options
   DESCRIPTION:=\
 	Netfilter (IPv4) modules for matching/changing IP packet options \\\
@@ -57,12 +62,14 @@ define KernelPackage/ipt-ipopt
 	- ipt_unclean
   KCONFIG:=$(KCONFIG_IPT_IPOPT)
   FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ipopt))
 
+
 define KernelPackage/ipt-ipsec
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for matching IPSec packets
   DESCRIPTION:=\
 	Netfilter (IPv4) modules for matching IPSec packets \\\
@@ -72,12 +79,14 @@ define KernelPackage/ipt-ipsec
 	- ipt_esp
   KCONFIG:=$(KCONFIG_IPT_IPSEC)
   FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ipsec))
 
+
 define KernelPackage/ipt-nat
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for extra NAT targets
   DESCRIPTION:=\
 	Netfilter (IPv4) modules for extra NAT targets \\\
@@ -87,12 +96,14 @@ define KernelPackage/ipt-nat
 	- ipt_NETMAP
   KCONFIG:=$(KCONFIG_IPT_NAT)
   FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-nat))
 
+
 define KernelPackage/ipt-nathelper
+  SUBMENU:=$(NFMENU)
   TITLE:=Default Conntrack and NAT helpers
   DESCRIPTION:=\
 	Default Netfilter (IPv4) Conntrack and NAT helpers \\\
@@ -105,12 +116,14 @@ define KernelPackage/ipt-nathelper
 	- ip_conntrack_tftp
   KCONFIG:=$(KCONFIG_IPT_NAT_DEFAULT)
   FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-nathelper))
 
+
 define KernelPackage/ipt-nathelper-extra
+  SUBMENU:=$(NFMENU)
   TITLE:=Extra Conntrack and NAT helpers
   DESCRIPTION:=\
 	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
@@ -126,24 +139,27 @@ define KernelPackage/ipt-nathelper-extra
 	- ip_nat_snmp_basic
   KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
   FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-nathelper-extra))
 
+
 define KernelPackage/ipt-imq
+  SUBMENU:=$(NFMENU)
   TITLE:=Intermediate Queueing support
   DESCRIPTION:=\
 	Kernel support for Intermediate Queueing devices
   KCONFIG:=CONFIG_IP_NF_TARGET_IMQ
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,ipt-imq))
 
 
 define KernelPackage/ipt-queue
+  SUBMENU:=$(NFMENU)
   TITLE:=Module for user-space packet queueing
   DESCRIPTION:=\
 	Netfilter (IPv4) module for user-space packet queueing \\\
@@ -152,12 +168,14 @@ define KernelPackage/ipt-queue
 	- ipt_QUEUE
   KCONFIG:=$(KCONFIG_IPT_QUEUE)
   FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-queue))
 
+
 define KernelPackage/ipt-ulog
+  SUBMENU:=$(NFMENU)
   TITLE:=Module for user-space packet logging
   DESCRIPTION:=\
 	Netfilter (IPv4) module for user-space packet logging \\\
@@ -166,12 +184,14 @@ define KernelPackage/ipt-ulog
 	- ipt_ULOG
   KCONFIG:=$(KCONFIG_IPT_ULOG)
   FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ulog))
 
+
 define KernelPackage/ipt-iprange
+  SUBMENU:=$(NFMENU)
   TITLE:=Module for matching ip ranges
   DESCRIPTION:=\
 	Netfilter (IPv4) module for matching ip ranges \\\
@@ -179,24 +199,27 @@ define KernelPackage/ipt-iprange
 	Includes: \\\
 	- ipt_IPRANGE
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/ipt_iprange.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-iprange))
 
+
 define KernelPackage/ipt-ipset
+  SUBMENU:=$(NFMENU)
   TITLE:=IPSET Modules
   DESCRIPTION:=\
   	Netfilter kernel modules for ipset
   KCONFIG:=$(KCONFIG_IPT_IPSET)
   FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSET-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ipset))
 
 
 define KernelPackage/ipt-extra
+  SUBMENU:=$(NFMENU)
   TITLE:=Extra modules
   DESCRIPTION:=\
 	Other Netfilter (IPv4) kernel modules\\\
@@ -210,43 +233,47 @@ define KernelPackage/ipt-extra
 	- xt_NOTRACK 
   KCONFIG:=$(KCONFIG_IPT_EXTRA)
   FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-extra))
 
+
 define KernelPackage/ip6tables
+  SUBMENU:=$(NFMENU)
   TITLE:=IPv6 modules
   DESCRIPTION:=\
 	Netfilter IPv6 firewalling support
   KCONFIG:=CONFIG_IP6_NF_IPTABLES
   FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,ip6tables))
 
 
 define KernelPackage/arptables
+  SUBMENU:=$(NFMENU)
   TITLE:=ARP firewalling modules
   DESCRIPTION:=\
 	Kernel modules for ARP firewalling
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_IP_NF_ARPTABLES
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,arptables))
 
 
 define KernelPackage/ebtables
+  SUBMENU:=$(NFMENU)
   TITLE:=Bridge firewalling modules
   DESCRIPTION:=\
 	Kernel modules for Ethernet Bridge firewalling
   DEPENDS:=@LINUX_2_6
   FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,ebtables))
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 6da38e4e05..a7e8fed5d2 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -9,48 +9,52 @@
 NSMENU:=Network Support
 
 define KernelPackage/atm
+  SUBMENU:=$(NSMENU)
   TITLE:=ATM support
   DESCRIPTION:= \
     Kernel modules for ATM support
   DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_ATM
   FILES:= \
     $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
     $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_ATM
-  SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,30,atm br2684)
 endef
+
 $(eval $(call KernelPackage,atm))
 
+
 define KernelPackage/atmtcp
+  SUBMENU:=$(NSMENU)
   TITLE:=ATM over TCP
   DESCRIPTION:= \
     Kernel module for ATM over TCP support
   DEPENDS:=@LINUX_2_6 kmod-atm
-  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y
-  SUBMENU:=$(NSMENU)
+  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef
+
 $(eval $(call KernelPackage,atmtcp))
 
+
 define KernelPackage/bonding
+  SUBMENU:=$(NSMENU)
   TITLE:=Ethernet bonding driver
   DESCRIPTION:= \
     Kernel module for NIC bonding.
-  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_BONDING
-  SUBMENU:=$(NSMENU)
+  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,bonding)
 endef
 $(eval $(call KernelPackage,bonding))
 
 define KernelPackage/ipip
+  SUBMENU:=$(NSMENU)
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
 	Kernel modules for IP in IP encapsulation
   KCONFIG:=CONFIG_NET_IPIP
-  SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/ipip/2.4
@@ -64,25 +68,30 @@ define KernelPackage/ipip/2.6
 	$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
 endef
+
 $(eval $(call KernelPackage,ipip))
 
+
 define KernelPackage/ipsec
+  SUBMENU:=$(NSMENU)
   TITLE:=IPsec related modules (IPv4 and IPv6)
   DESCRIPTION:=\
 	Kernel modules for IPsec support in both IPv4 and IPv6.\\\
 	Includes:\\\
 	- af_key\\\
 	- xfrm_user
-  SUBMENU:=$(NSMENU)
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_NET_KEY
   FILES:= \
 	$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,ipsec))
 
+
 define KernelPackage/ipsec4
+  SUBMENU:=$(NSMENU)
   TITLE:=IPsec related modules (IPv4)
   DESCRIPTION:=\
 	Kernel modules for IPsec support in IPv4.\\\
@@ -91,16 +100,18 @@ define KernelPackage/ipsec4
 	- esp4\\\
 	- ipcomp\\\
 	- xfrm4_tunnel
-  SUBMENU:=$(NSMENU)
-  KCONFIG:=CONFIG_INET_AH
   DEPENDS:=kmod-ipsec
+  KCONFIG:=CONFIG_INET_AH
   FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
 	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
   )
 endef
+
 $(eval $(call KernelPackage,ipsec4))
 
+
 define KernelPackage/ipsec6
+  SUBMENU:=$(NSMENU)
   TITLE:=IPsec related modules (IPv6)
   DESCRIPTION:=\
 	Kernel modules for IPsec support in IPv6.\\\
@@ -110,64 +121,77 @@ define KernelPackage/ipsec6
 	- ipcomp6\\\
 	- xfrm6_tunnel\\\
 	- tunnel6
-  SUBMENU:=$(NSMENU)
-  KCONFIG:=CONFIG_INET6_AH
   DEPENDS:=kmod-ipsec
+  KCONFIG:=CONFIG_INET6_AH
   FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel tunnel6, \
 	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
   )
 endef
+
 $(eval $(call KernelPackage,ipsec6))
 
 
 define KernelPackage/ipv6
+  SUBMENU:=$(NSMENU)
   TITLE:=IPv6 support
   DESCRIPTION:=\
 	Kernel modules for IPv6 support
   KCONFIG:=CONFIG_IPV6
-  SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)
 endef
+
 define KernelPackage/ipv6/2.4
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
 endef
+
 define KernelPackage/ipv6/2.6
   FILES:= \
 	$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,ipv6))
 
 
 define KernelPackage/gre
+  SUBMENU:=$(NSMENU)
   TITLE:=GRE support
   DESCRIPTION:=\
 	Generic Routing Encapsulation support
   KCONFIG:=CONFIG_NET_IPGRE
   FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
 endef
+
 $(eval $(call KernelPackage,gre))
 
 
 define KernelPackage/tun
+  SUBMENU:=$(NSMENU)
   TITLE:=Universal TUN/TAP driver
   DESCRIPTION:=\
 	Kernel support for the TUN/TAP tunneling device
   KCONFIG:=CONFIG_TUN
   FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,30,tun)
 endef
+
 $(eval $(call KernelPackage,tun))
 
 
 define KernelPackage/ppp
+  SUBMENU:=$(NSMENU)
   TITLE:=PPP modules
   DESCRIPTION:=\
 	Kernel modules for PPP support
   KCONFIG:=CONFIG_PPP
-  SUBMENU:=$(NSMENU)
+endef
+
+define KernelPackage/ppp/2.4
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ppp_async.o \
+	$(LINUX_DIR)/drivers/net/ppp_generic.o \
+	$(LINUX_DIR)/drivers/net/slhc.o
+  AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
 endef
 
 define KernelPackage/ppp/2.6
@@ -179,30 +203,25 @@ define KernelPackage/ppp/2.6
   AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
 endef
 
-define KernelPackage/ppp/2.4
-  FILES:= \
-	$(LINUX_DIR)/drivers/net/ppp_async.o \
-	$(LINUX_DIR)/drivers/net/ppp_generic.o \
-	$(LINUX_DIR)/drivers/net/slhc.o
-  AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
-endef
 $(eval $(call KernelPackage,ppp))
 
 
 define KernelPackage/ppp-synctty
+  SUBMENU:=$(NSMENU)
   TITLE:=PPP sync tty support
   DESCRIPTION:=\
 	Kernel modules for PPP sync tty support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_SYNC_TTY
-  SUBMENU:=$(NSMENU)
   FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,ppp_synctty)
 endef
+
 $(eval $(call KernelPackage,ppp-synctty))
 
 
 define KernelPackage/pppoe
+  SUBMENU:=$(NSMENU)
   TITLE:=PPPoE support
   DESCRIPTION:=\
 	Kernel modules for PPPoE (PPP over Ethernet) support
@@ -211,12 +230,13 @@ define KernelPackage/pppoe
   FILES:= \
 	$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
 endef
+
 $(eval $(call KernelPackage,pppoe))
 
 
 define KernelPackage/pppoa
+  SUBMENU:=$(NSMENU)
   TITLE:=PPPoA support
   DESCRIPTION:=\
 	Kernel modules for PPPoA (PPP over ATM) support
@@ -224,17 +244,17 @@ define KernelPackage/pppoa
   KCONFIG:=CONFIG_PPPOATM
   FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)
-  SUBMENU:=$(NSMENU)
 endef
+
 $(eval $(call KernelPackage,pppoa))
 
 
 define KernelPackage/mppe
+  SUBMENU:=$(NSMENU)
   TITLE:=Microsoft PPP compression/encryption
   DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_MPPE_MPPC CONFIG_PPP_MPPE
-  SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/mppe/2.4
@@ -246,34 +266,38 @@ define KernelPackage/mppe/2.6
   FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
+
 $(eval $(call KernelPackage,mppe))
 
 
 define KernelPackage/sched
+  SUBMENU:=$(NSMENU)
   TITLE:=Traffic schedulers
   DESCRIPTION:=\
 	Kernel schedulers for IP traffic
   FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
 endef
+
 $(eval $(call KernelPackage,sched))
 
 
 
 define KernelPackage/ax25
+  SUBMENU:=$(NSMENU)
   TITLE:=AX25 support
   DESCRIPTION:=Kernel modules for AX25 support
-  SUBMENU:=$(NSMENU)
   KCONFIG:=CONFIG_AX25 CONFIG_MKISS
   FILES:= \
 	$(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
 endef
+
 $(eval $(call KernelPackage,ax25))
 
 
 define KernelPackage/mp-alg
+  SUBMENU:=$(NSMENU)
   TITLE:=ECMP caching algorithms
   DEPENDS:=@LINUX_2_6
   DESCRIPTION:= \
@@ -282,152 +306,177 @@ define KernelPackage/mp-alg
 	specifying which algorithm to use for routes. \\\
 	quagga (at least <=0.99.6) requires a multipath patch to support this \\\
 	cached mp route feature.
-  SUBMENU:=$(NSMENU)
   KCONFIG:=CONFIG_IP_ROUTE_MULTIPATH_RR CONFIG_IP_ROUTE_MULTIPATH_RANDOM CONFIG_IP_ROUTE_MULTIPATH_WRANDOM CONFIG_IP_ROUTE_MULTIPATH_DRR
   FILES:=$(LINUX_DIR)/net/ipv4/multipath_*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
 endef
+
 $(eval $(call KernelPackage,mp-alg))
 
 
 NDMENU:=Network Devices
 
 define KernelPackage/natsemi
+  SUBMENU:=$(NDMENU)
   TITLE:=National Semiconductor DP8381x series 
   DESCRIPTION:=\
 	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
 	adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_NATSEMI
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_NATSEMI
+  FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
+
 $(eval $(call KernelPackage,natsemi))
 
+
 define KernelPackage/r6040
+  SUBMENU:=$(NDMENU)
   TITLE:=RDC Fast-Ethernet support
   DESCRIPTION:=\
 	Kernel modules for RDC Fast-Ethernet adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_R6040
   DEPENDS:=@LINUX_2_6_RDC
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_R6040
+  FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,r6040))
 
+
 define KernelPackage/sis900
+  SUBMENU:=$(NDMENU)
   TITLE:=SiS 900 Ethernet support
   DESCRIPTION:=\
 	Kernel modules for Sis 900 Ethernet adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_SIS900
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_SIS900
+  FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef
+
 $(eval $(call KernelPackage,sis900))
 
+
 define KernelPackage/via-rhine
+  SUBMENU:=$(NDMENU)
   TITLE:=Via Rhine ethernet support
   DESCRIPTION:=\
 	Kernel modules for Via Rhine Ethernet chipsets.
-  FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_VIA_RHINE
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_VIA_RHINE
+  FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
+
 $(eval $(call KernelPackage,via-rhine))
 
+
 define KernelPackage/via-velocity
+  SUBMENU:=$(NDMENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
   DESCRIPTION:=\
 	Kernel modules for VIA Velocity Gigabit Ethernet chipsets.
-  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_VIA_VELOCITY
   DEPENDS:=@LINUX_2_6_IXP4XX
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_VIA_VELOCITY
+  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,via-velocity)
 endef
+
 $(eval $(call KernelPackage,via-velocity))
 
+
 define KernelPackage/8139too
+  SUBMENU:=$(NDMENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DESCRIPTION:=\
 	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_8139TOO
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_8139TOO
+  FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,8139too)
 endef
+
 $(eval $(call KernelPackage,8139too))
 
+
 define KernelPackage/r8169
+  SUBMENU:=$(NDMENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
   DESCRIPTION:=\
 	Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
   DEPENDS:=@LINUX_2_6_X86 
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
+  FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,r8169)
 endef
+
 $(eval $(call KernelPackage,r8169))
 
+
 define KernelPackage/ne2k-pci
+  SUBMENU:=$(NDMENU)
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DESCRIPTION:=\
 	ne2k-pci Ethernet Adapter kernel support.
-  FILES:=$(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_NE2K_PCI
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_NE2K_PCI
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
 endef
+
 $(eval $(call KernelPackage,ne2k-pci))
 
+
 define KernelPackage/ixp4xx-npe
+  SUBMENU:=$(NDMENU)
   TITLE:=Intel(R) IXP4xx ethernet support
   DESCRIPTION:=\
 	Kernel modules for Intel(R) IXP4xx onboard ethernet.
-  FILES:=$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \
+  DEPENDS:=@LINUX_2_6_IXP4XX
+  KCONFIG:=CONFIG_IXP4XX_MAC
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_qmgr.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_mac.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_IXP4XX_MAC
-  DEPENDS:=@LINUX_2_6_IXP4XX
-  SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,ixp4xx_npe ixp4xx_qmgr ixp4xx_mac)
 endef
+
 $(eval $(call KernelPackage,ixp4xx-npe))
 
+
 define KernelPackage/e100
+  SUBMENU:=$(NDMENU)
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DESCRIPTION:=\
 	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_E100
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_E100
+  FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,e100)
 endef
+
 $(eval $(call KernelPackage,e100))
 
+
 define KernelPackage/e1000
+  SUBMENU:=$(NDMENU)
   TITLE:=Intel(R) PRO/1000 cards kernel support
   DESCRIPTION:=\
 	Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
-  FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_E1000
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_E1000
+  FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,e1000)
 endef
+
 $(eval $(call KernelPackage,e1000))
 
+
 define KernelPackage/3c59x
+  SUBMENU:=$(NDMENU)
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DESCRIPTION:=\
 	This option enables driver support for a large number of 10mbps and \\\
@@ -437,10 +486,10 @@ define KernelPackage/3c59x
 	- "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \\\
 	- "Tornado"   (3c905)                                  PCI  \\\
 	- "Hurricane" (3c555/3cSOHO)                           PCI 
-  FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_3C59X
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(NDMENU)
+  KCONFIG:=CONFIG_3C59X
+  FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,3c59x)
 endef
+
 $(eval $(call KernelPackage,3c59x))
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 55121a5169..82fe711481 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -9,6 +9,7 @@
 EMENU:=Other modules
 
 define KernelPackage/crypto
+  SUBMENU:=$(EMENU)
   TITLE:=CryptoAPI modules
   KCONFIG:= \
 	CONFIG_CRYPTO_HMAC \
@@ -37,11 +38,13 @@ define KernelPackage/crypto
 	CONFIG_CRYPTO_ECB \
 	CONFIG_CRYPTO_BLKCIPHER 
   FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(EMENU)
 endef
+
 $(eval $(call KernelPackage,crypto))
 
+
 define KernelPackage/lp
+  SUBMENU:=$(EMENU)
   TITLE:=Parallel port and line printer support
   DEPENDS:=@LINUX_2_4
   KCONFIG:=CONFIG_PARPORT
@@ -49,20 +52,17 @@ define KernelPackage/lp
 	$(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,50, \
-  	parport \
-  	lp \
-  )
+  AUTOLOAD:=$(call AutoLoad,50,parport lp)
 endef
+
 $(eval $(call KernelPackage,lp))
 
 
 define KernelPackage/soundcore
+  SUBMENU:=$(EMENU)
   TITLE:=Sound support
   DESCRIPTION:=Kernel modules for sound support
   KCONFIG:=CONFIG_SOUND
-  SUBMENU:=$(EMENU)
 endef
 
 define KernelPackage/soundcore/2.4
@@ -89,41 +89,46 @@ $(eval $(call KernelPackage,soundcore))
 
 
 define KernelPackage/loop
+  SUBMENU:=$(EMENU)
   TITLE:=Loopback device support
   DESCRIPTION:=Kernel module for loopback device support
   KCONFIG:=CONFIG_BLK_DEV_LOOP
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,loop)
   FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,loop)
 endef
+
 $(eval $(call KernelPackage,loop))
 
+
 define KernelPackage/nbd
+  SUBMENU:=$(EMENU)
   TITLE:=Network block device support
   DESCRIPTION:=Kernel module for network block device support
   KCONFIG:=CONFIG_BLK_DEV_NBD
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,nbd)
   FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,nbd)
 endef
+
 $(eval $(call KernelPackage,nbd))
 
+
 define KernelPackage/capi
+  SUBMENU:=$(EMENU)
   TITLE:=CAPI Support
   DESCRIPTION:=Kernel module for basic CAPI support
-  KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
   DEPENDS:=@LINUX_2_6
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+  KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
   FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
 endef
+
 $(eval $(call KernelPackage,capi))
 
+
 define KernelPackage/pcmcia-core
   TITLE:=PCMCIA/CardBus support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
   DEPENDS:=@PCMCIA_SUPPORT
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD CONFIG_PCMCIA_AU1X00
 endef
 
@@ -148,16 +153,17 @@ define KernelPackage/pcmcia-core/2.6
 	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic $(PCMCIA_SOCKET_DRIVER))
 endef
+
 $(eval $(call KernelPackage,pcmcia-core))
 
 
 define KernelPackage/pcmcia-serial
+  SUBMENU:=$(EMENU)
   TITLE:=Serial devices support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus serial devices
   DEPENDS:=kmod-pcmcia-core
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
   KCONFIG:=CONFIG_PCMCIA_SERIAL_CS CONFIG_SERIAL_8250_CS
+  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
 define KernelPackage/pcmcia-serial/2.4
@@ -167,14 +173,15 @@ endef
 define KernelPackage/pcmcia-serial/2.6
   FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,pcmcia-serial))
 
 
 define KernelPackage/bluetooth
+  SUBMENU:=$(EMENU)
   TITLE:=Bluetooth support
   DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_BLUEZ CONFIG_BT CONFIG_USB_BLUETOOTH
  endef
 
@@ -201,13 +208,15 @@ define KernelPackage/bluetooth/2.6
 	$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb)
 endef
+
 $(eval $(call KernelPackage,bluetooth))
 
+
 define KernelPackage/mmc
+  SUBMENU:=$(EMENU)
   TITLE:=MMC/SD Card Support
   DEPENDS:=@LINUX_2_6_AT91
   DESCRIPTION:=Kernel support for MMC/SD cards
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_MMC
   FILES:= \
 	$(LINUX_DIR)/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
@@ -215,12 +224,14 @@ define KernelPackage/mmc
 	$(LINUX_DIR)/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
 endef
+
 $(eval $(call KernelPackage,mmc))
 
+
 define KernelPackage/softdog
+  SUBMENU:=$(EMENU)
   TITLE:=Software watchdog driver
   DESCRIPTION:=Software watchdog driver
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SOFT_WATCHDOG
   AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
@@ -232,13 +243,14 @@ endef
 define KernelPackage/softdog/2.6
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
 endef
+
 $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/videodev
+  SUBMENU:=$(EMENU)
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_VIDEO_DEV
   FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
 endef
@@ -250,95 +262,111 @@ endef
 define KernelPackage/videodev/2.6
   AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat compat_ioctl32 videodev)
 endef
+
 $(eval $(call KernelPackage,videodev))
 
+
 define KernelPackage/leds-net48xx
+  SUBMENU:=$(EMENU)
   TITLE:=Soekris Net48xx LED support
   DESCRIPTION:=Kernel module for Soekris Net48xx LEDs
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_LEDS_NET48XX
   FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
 endef
+
 $(eval $(call KernelPackage,leds-net48xx))
 
+
 define KernelPackage/nsc-gpio
+  SUBMENU:=$(EMENU)
   TITLE:=Natsemi GPIO support
   DESCRIPTION:=Kernel module for Natsemi GPIO
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_NSC_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
 endef
+
 $(eval $(call KernelPackage,nsc-gpio))
 
+
 define KernelPackage/scx200-gpio
+  SUBMENU:=$(EMENU)
   TITLE:=Natsemi SCX200 GPIO support
   DESCRIPTION:=Kernel module for SCX200 GPIO
   DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SCx200_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
 endef
+
 $(eval $(call KernelPackage,scx200-gpio))
 
+
 define KernelPackage/scx200-wdt
+  SUBMENU:=$(EMENU)
   TITLE:=Natsemi SCX200 Watchdog support
   DESCRIPTION:=Kernel module for SCX200 Watchdog
   DEPENDS:=@LINUX_2_6_X86
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SC1200_WDT
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef
+
 $(eval $(call KernelPackage,scx200-wdt))
 
+
 define KernelPackage/hwmon
+  SUBMENU:=$(EMENU)
   TITLE:=Hardware monitoring support
   DESCRIPTION:=Kernel modules for hardware monitoring
   DEPENDS:=@LINUX_2_6
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_HWMON_VID
   FILES:= \
 	$(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,hwmon hwmon-vid)
 endef
+
 $(eval $(call KernelPackage,hwmon))
 
+
 define KernelPackage/hwmon-pc87360
+  SUBMENU:=$(EMENU)
   TITLE:=PC87360 monitoring support
   DESCRIPTION:=Kernel modules for PC87360 chips
   DEPENDS:=kmod-hwmon
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SENSORS_PC87360
   FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,pc87360)
 endef
+
 $(eval $(call KernelPackage,hwmon-pc87360))
 
+
 define KernelPackage/input-core
+  SUBMENU:=$(EMENU)
   TITLE:=Input device core
   DESCRIPTION:=Kernel modules for support of input device
-  SUBMENU:=$(EMENU)
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT
   FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,input-core)
 endef
+
 $(eval $(call KernelPackage,input-core))
 
+
 define KernelPackage/input-evdev
+  SUBMENU:=$(EMENU)
   TITLE:=Input even device
   DESCRIPTION:=Kernel modules for support of input device events
   DEPENDS:=+kmod-input-core
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_INPUT_EVDEV
   FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,evdev)
 endef
-$(eval $(call KernelPackage,input-evdev))
 
+$(eval $(call KernelPackage,input-evdev))
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 23413a8e35..f6991c248f 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -27,12 +27,13 @@ define usbdep
   DEPENDS:=kmod-usb-core $(1)
 endef
 
+
 define KernelPackage/usb-core
+  SUBMENU:=$(USBMENU)
   TITLE:=Support for USB
   DESCRIPTION:=Kernel support for USB
   DEPENDS:=@USB_SUPPORT
   KCONFIG:=CONFIG_USB
-  SUBMENU:=$(USBMENU)
   AUTOLOAD:=$(call AutoLoad,20,usbcore)
 endef
 
@@ -43,6 +44,7 @@ endef
 define KernelPackage/usb-core/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,usb-core))
 
 
@@ -52,26 +54,32 @@ define KernelPackage/usb-uhci
   DESCRIPTION:=Kernel support for USB UHCI controllers
   KCONFIG:=CONFIG_USB_UHCI_ALT CONFIG_USB_UHCI_HCD
 endef
+
 define KernelPackage/usb-uhci/2.4
   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
   AUTOLOAD:=$(call AutoLoad,50,uhci)
 endef
+
 define KernelPackage/usb-uhci/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
 endef
+
 $(eval $(call KernelPackage,usb-uhci))
 
+
 define KernelPackage/usb-uhci-iv
   $(call usbdep,@LINUX_2_4)
   TITLE:=Support for Intel/VIA UHCI controllers 
   DESCRIPTION:=Kernel support for Intel/VIA USB UHCI controllers
-  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_USB_UHCI
+  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,usb-uhci) 
 endef 
+
 $(eval $(call KernelPackage,usb-uhci-iv)) 
 
+
 define KernelPackage/usb-ohci
   $(call usbdep,)
   TITLE:=Support for OHCI controllers
@@ -88,8 +96,10 @@ define KernelPackage/usb-ohci/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
 endef
+
 $(eval $(call KernelPackage,usb-ohci))
 
+
 define KernelPackage/usb-adm5120
   $(call usbdep,@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB)
   TITLE:=Support for the ADM5120 HCD controller
@@ -98,16 +108,19 @@ define KernelPackage/usb-adm5120
   FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd)
 endef
+
 $(eval $(call KernelPackage,usb-adm5120))
 
+
 define KernelPackage/usb2
   $(call usbdep,)
   TITLE:=Support for USB2 controllers
   DESCRIPTION:=Kernel support for USB2 (EHCI) controllers
-  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_USB_EHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
 endef
+
 $(eval $(call KernelPackage,usb2))
 
 
@@ -127,6 +140,7 @@ define KernelPackage/usb-acm/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko
   AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
 endef
+
 $(eval $(call KernelPackage,usb-acm))
 
 
@@ -148,6 +162,7 @@ define KernelPackage/usb-audio/2.6
 	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
   AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
 endef
+
 $(eval $(call KernelPackage,usb-audio))
 
 
@@ -167,6 +182,7 @@ define KernelPackage/usb-printer/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko
   AUTOLOAD:=$(call AutoLoad,60,usblp)
 endef
+
 $(eval $(call KernelPackage,usb-printer))
 
 
@@ -178,8 +194,10 @@ define KernelPackage/usb-serial
   FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,usbserial)
 endef
+
 $(eval $(call KernelPackage,usb-serial))
 
+
 define KernelPackage/usb-serial-airprime
   $(call usbdep,kmod-usb-serial @LINUX_2_6)
   TITLE:=Support for Airprime (EVDO) 
@@ -188,8 +206,10 @@ define KernelPackage/usb-serial-airprime
   FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,airprime)
 endef
+
 $(eval $(call KernelPackage,usb-serial-airprime))
 
+
 define KernelPackage/usb-serial-belkin
   $(call usbdep,kmod-usb-serial)
   TITLE:=Support for Belkin devices
@@ -198,6 +218,7 @@ define KernelPackage/usb-serial-belkin
   FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,belkin_sa)
 endef
+
 $(eval $(call KernelPackage,usb-serial-belkin))
 
 
@@ -209,6 +230,7 @@ define KernelPackage/usb-serial-ftdi
   FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)
 endef
+
 $(eval $(call KernelPackage,usb-serial-ftdi))
 
 
@@ -220,8 +242,10 @@ define KernelPackage/usb-serial-mct
   FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,mct_u232)
 endef
+
 $(eval $(call KernelPackage,usb-serial-mct))
 
+
 define KernelPackage/usb-serial-pl2303
   $(call usbdep,kmod-usb-serial)
   TITLE:=Support for Prolific PL2303 devices
@@ -230,6 +254,7 @@ define KernelPackage/usb-serial-pl2303
   FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,pl2303)
 endef
+
 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
@@ -241,6 +266,7 @@ define KernelPackage/usb-serial-sierrawireless
   FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,sierra)
 endef
+
 $(eval $(call KernelPackage,usb-serial-sierrawireless))
 
 
@@ -252,8 +278,10 @@ define KernelPackage/usb-serial-visor
   FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,visor)
 endef
+
 $(eval $(call KernelPackage,usb-serial-visor))
 
+
 define KernelPackage/usb-serial-keyspan
   $(call usbdep,kmod-usb-serial)
   TITLE:=Support for Keyspan USB-to-Serial devices
@@ -275,8 +303,10 @@ define KernelPackage/usb-serial-keyspan
   FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,keyspan)
 endef
+
 $(eval $(call KernelPackage,usb-serial-keyspan))
 
+
 define KernelPackage/usb-serial-option
   $(call usbdep,kmod-usb-serial @LINUX_2_6)
   TITLE:=Support for Option HSDPA modems
@@ -285,6 +315,7 @@ define KernelPackage/usb-serial-option
   FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,option)
 endef
+
 $(eval $(call KernelPackage,usb-serial-option))
 
 
@@ -293,12 +324,13 @@ define KernelPackage/usb-storage
   TITLE:=USB Storage support
   DESCRIPTION:=Kernel support for USB Mass Storage devices
   KCONFIG:=CONFIG_USB_STORAGE
-  FILES:= \
-	$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
 endef
+
 $(eval $(call KernelPackage,usb-storage))
 
+
 define KernelPackage/usb-atm
   $(call usbdep,@LINUX_2_6 kmod-atm)
   TITLE:=Support for ATM on USB bus
@@ -307,8 +339,10 @@ define KernelPackage/usb-atm
   FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,usbatm)
 endef
+
 $(eval $(call KernelPackage,usb-atm))
 
+
 define KernelPackage/usb-speedtouch
   $(call usbdep,@LINUX_2_6 kmod-atm)
   TITLE:=Support for SpeedTouch ADSL modems
@@ -317,8 +351,10 @@ define KernelPackage/usb-speedtouch
   FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,speedtch)
 endef
+
 $(eval $(call KernelPackage,usb-speedtouch))
 
+
 define KernelPackage/ueagle-atm
   $(call usbdep,@LINUX_2_6 kmod-atm)
   TITLE:=Driver for Eagle 8051 based USB ADSL modems
@@ -327,8 +363,10 @@ define KernelPackage/ueagle-atm
   KCONFIG:=CONFIG_USB_UEAGLEATM
   AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
 endef
+
 $(eval $(call KernelPackage,ueagle-atm))
 
+
 define KernelPackage/usb-pwc
   $(call usbdep,+kmod-videodev @LINUX_2_6)
   TITLE:=Philips WebCam driver
@@ -340,16 +378,19 @@ endef
 
 $(eval $(call KernelPackage,usb-pwc))
 
+
 define KernelPackage/cpia2
   $(call usbdep,+kmod-videodev @LINUX_2_6)
   TITLE:=CPIA2 video driver
   DESCRIPTION:=Kernel modules for CPIA2 WebCam devices
   KCONFIG:=CONFIG_VIDEO_CPIA2
-  AUTOLOAD:=$(call AutoLoad,70,cpia2)
   FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,cpia2)
 endef
+
 $(eval $(call KernelPackage,cpia2))
 
+
 define KernelPackage/usb-net
   $(call usbdep,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
@@ -368,6 +409,7 @@ endef
 
 $(eval $(call KernelPackage,usb-net))
 
+
 define KernelPackage/usb-net-asix
   $(call usbdep,kmod-usb-net @LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Asix convertors
@@ -379,6 +421,7 @@ endef
 
 $(eval $(call KernelPackage,usb-net-asix))
 
+
 define KernelPackage/usb-net-kaweth
   $(call usbdep,kmod-usb-net @LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
@@ -390,6 +433,7 @@ endef
 
 $(eval $(call KernelPackage,usb-net-kaweth))
 
+
 define KernelPackage/usb-net-pegasus
   $(call usbdep,kmod-usb-net @LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
@@ -401,6 +445,7 @@ endef
 
 $(eval $(call KernelPackage,usb-net-pegasus))
 
+
 define KernelPackage/usb-hid
   $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
   TITLE:=Support for USB Human Input Devices
@@ -412,6 +457,7 @@ endef
 
 $(eval $(call KernelPackage,usb-hid))
 
+
 define KernelPackage/usb-yealink
   $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
   TITLE:=USB Yealink VOIP phone
@@ -420,6 +466,5 @@ define KernelPackage/usb-yealink
   FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
   AUTOLOAD:=$(call AutoLoad,70,yealink)
 endef
-$(eval $(call KernelPackage,usb-yealink))
-
 
+$(eval $(call KernelPackage,usb-yealink))
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 88b2bea694..20999e1ccf 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -9,6 +9,7 @@
 WIMENU:=Wireless Drivers
 
 define KernelPackage/ieee80211
+  SUBMENU:=$(WIMENU)
   TITLE:=802.11 Networking stack
   DESCRIPTION:=\\\
 	\\\
@@ -29,23 +30,26 @@ define KernelPackage/ieee80211
 	ieee80211_crypt_tkip \
 	ieee80211_crypt_ccmp \
   )
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
+  SUBMENU:=$(WIMENU)
   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC
   FILES:= \
 	$(LINUX_DIR)/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,ieee80211-softmac))
 
+
 define KernelPackage/net-bcm43xx
+  SUBMENU:=$(WIMENU)
   TITLE:=Broadcom BCM43xx driver
   DESCRIPTION:=\\\
 	\\\
@@ -55,11 +59,13 @@ define KernelPackage/net-bcm43xx
   KCONFIG:=CONFIG_BCM43XX
   FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,net-bcm43xx))
 
+
 define KernelPackage/net-ipw2100
+  SUBMENU:=$(WIMENU)
   TITLE:=Intel IPW2100 driver
   DESCRIPTION:=\\\
 	\\\
@@ -69,11 +75,13 @@ define KernelPackage/net-ipw2100
   KCONFIG:=CONFIG_IPW2100
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2100)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,net-ipw2100))
 
+
 define KernelPackage/net-ipw2200
+  SUBMENU:=$(WIMENU)
   TITLE:=Intel IPW2200 driver
   DESCRIPTION:=\\\
 	\\\
@@ -83,37 +91,40 @@ define KernelPackage/net-ipw2200
   KCONFIG:=CONFIG_IPW2200
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2200)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
+  SUBMENU:=$(WIMENU)
   TITLE:=Cisco Aironet driver
   DESCRIPTION:=Driver for Cisco Aironet cards
   KCONFIG:=CONFIG_AIRO
-  SUBMENU:=$(WIMENU)
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
+
 $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
+  SUBMENU:=$(WIMENU)
   TITLE:=Hermes 802.11b chipset support
   DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_HERMES
-  SUBMENU:=$(WIMENU)
   FILES:= \
 	$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
 endef
+
 $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
+  SUBMENU:=$(WIMENU)
   TITLE:=Intersil Prism 2.5 PCI support
   DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
   DEPENDS:=kmod-net-hermes
@@ -122,22 +133,25 @@ define KernelPackage/net-hermes-pci
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
+
 $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
+  SUBMENU:=$(WIMENU)
   TITLE:=PLX9052 based PCI adaptor
   DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
   DEPENDS:=kmod-net-hermes
   KCONFIG:=CONFIG_PLX_HERMES
-  SUBMENU:=$(WIMENU)
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
+
 $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
+  SUBMENU:=$(WIMENU)
   TITLE:=Intersil Prism54 support
   DESCRIPTION:=Kernel modules for Intersil Prism54 support
   KCONFIG:=CONFIG_PRISM54
@@ -145,16 +159,18 @@ define KernelPackage/net-prism54
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef
+
 $(eval $(call KernelPackage,net-prism54))
 
 
 define KernelPackage/net-zd1211rw
+  SUBMENU:=$(WIMENU)
   TITLE:=Zydas ZD1211 support
   DESCRIPTION:=Kernel modules Zydas ZD1211 support, kernel version
-  KCONFIG:=CONFIG_ZD1211RW
   DEPENDS:=+kmod-ieee80211 +zd1211-firmware @LINUX_2_6
-  SUBMENU:=$(WIMENU)
+  KCONFIG:=CONFIG_ZD1211RW
   FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
 endef
+
 $(eval $(call KernelPackage,net-zd1211rw))