cosmetic changes: rename submenu vars, add missing copyright headers

SVN-Revision: 8808

8 files changed, 139 insertions, 123 deletions

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 9b81fa8..ce72abd 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -1,7 +1,15 @@
-BLMENU:=Block Devices
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+BLOCK_MENU:=Block Devices
 
 define KernelPackage/ide-core
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=Kernel support for IDE
   KCONFIG:= \
 	CONFIG_IDE \
@@ -38,7 +46,7 @@ $(eval $(call KernelPackage,ide-core))
 
 
 define KernelPackage/ide-pdc202xx
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=PDC202xx IDE driver
   DEPENDS:=@LINUX_2_4
   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
@@ -50,7 +58,7 @@ $(eval $(call KernelPackage,ide-pdc202xx))
 
 
 define KernelPackage/ide-aec62xx
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=AEC62xx IDE driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_BLK_DEV_AEC62XX
@@ -62,7 +70,7 @@ $(eval $(call KernelPackage,ide-aec62xx))
 
 
 define KernelPackage/scsi-core
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=Kernel support for SCSI
   KCONFIG:= \
 	CONFIG_SCSI \
@@ -77,7 +85,7 @@ $(eval $(call KernelPackage,scsi-core))
 
 
 define KernelPackage/libata
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=libata
   DEPENDS:=@PCI_SUPPORT @LINUX_2_6
   KCONFIG:=CONFIG_ATA
@@ -89,7 +97,7 @@ $(eval $(call KernelPackage,libata))
 
 
 define KernelPackage/ata-piix
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=ata-piix
   DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
   KCONFIG:=CONFIG_ATA_PIIX
@@ -105,7 +113,7 @@ $(eval $(call KernelPackage,ata-piix))
 
 
 define KernelPackage/pata-artop
-  SUBMENU:=$(BLMENU)
+  SUBMENU:=$(BLOCK_MENU)
   TITLE:=pata-artop
   DEPENDS:=+kmod-libata +kmod-scsi-core
   KCONFIG:=CONFIG_PATA_ARTOP
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index b966c89..93f99ef 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,4 +1,12 @@
-FSMENU:=Filesystems
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+FS_MENU:=Filesystems
 
 define KernelPackage/nls/Depends
   ifneq ($(KERNEL),2.4)
@@ -7,7 +15,7 @@ define KernelPackage/nls/Depends
 endef
 
 define KernelPackage/fs-cifs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_CIFS
@@ -25,7 +33,7 @@ $(eval $(call KernelPackage,fs-cifs))
 
 
 define KernelPackage/fs-minix
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Minix filesystem support
   KCONFIG:=CONFIG_MINIX_FS
   FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
@@ -40,7 +48,7 @@ $(eval $(call KernelPackage,fs-minix))
 
 
 define KernelPackage/fs-ntfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=NTFS filesystem support
   KCONFIG:=CONFIG_NTFS_FS
   FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
@@ -55,7 +63,7 @@ $(eval $(call KernelPackage,fs-ntfs))
 
 
 define KernelPackage/fs-ext2
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
@@ -70,7 +78,7 @@ $(eval $(call KernelPackage,fs-ext2))
 
 
 define KernelPackage/fs-ext3
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=EXT3 filesystem support
   KCONFIG:= \
 	CONFIG_EXT3_FS \
@@ -89,7 +97,7 @@ $(eval $(call KernelPackage,fs-ext3))
 
 
 define KernelPackage/fs-hfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_HFS_FS
@@ -106,7 +114,7 @@ $(eval $(call KernelPackage,fs-hfs))
 
 
 define KernelPackage/fs-hfsplus
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_HFSPLUS_FS
@@ -124,7 +132,7 @@ $(eval $(call KernelPackage,fs-hfsplus))
 
 
 define KernelPackage/fs-isofs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO9660 filesystem support
   KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
   FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
@@ -141,7 +149,7 @@ $(eval $(call KernelPackage,fs-isofs))
 
 
 define KernelPackage/fs-udf
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=UDF filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_UDF_FS
@@ -159,7 +167,7 @@ $(eval $(call KernelPackage,fs-udf))
 
 
 define KernelPackage/fs-nfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=NFS filesystem support
   KCONFIG:= \
 	CONFIG_NFS_FS \
@@ -180,7 +188,7 @@ $(eval $(call KernelPackage,fs-nfs))
 
 
 define KernelPackage/fs-nfsd
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=NFS kernel server support
   KCONFIG:= \
 	CONFIG_NFSD \
@@ -203,7 +211,7 @@ $(eval $(call KernelPackage,fs-nfsd))
 
 
 define KernelPackage/fs-msdos
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_MSDOS_FS
@@ -221,7 +229,7 @@ $(eval $(call KernelPackage,fs-msdos))
 
 
 define KernelPackage/fs-vfat
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=VFAT filesystem support
   KCONFIG:= \
 	CONFIG_FAT_FS \
@@ -242,7 +250,7 @@ $(eval $(call KernelPackage,fs-vfat))
 
 
 define KernelPackage/fs-xfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=XFS filesystem support
   KCONFIG:=CONFIG_XFS_FS
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
@@ -257,7 +265,7 @@ $(eval $(call KernelPackage,fs-xfs))
 
 
 define KernelPackage/nls-base
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Native Language Support
   KCONFIG:=CONFIG_NLS
   FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
@@ -272,7 +280,7 @@ $(eval $(call KernelPackage,nls-base))
 
 
 define KernelPackage/nls-cp437
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 437 (United States, Canada)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_437
@@ -290,7 +298,7 @@ $(eval $(call KernelPackage,nls-cp437))
 
 
 define KernelPackage/nls-cp850
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 850 (Europe)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_850
@@ -308,7 +316,7 @@ $(eval $(call KernelPackage,nls-cp850))
 
 
 define KernelPackage/nls-cp1250
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 1250 (Eastern Europe)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_1250
@@ -326,7 +334,7 @@ $(eval $(call KernelPackage,nls-cp1250))
 
 
 define KernelPackage/nls-iso8859-1
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_1
@@ -344,7 +352,7 @@ $(eval $(call KernelPackage,nls-iso8859-1))
 
 
 define KernelPackage/nls-iso8859-2
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_2
@@ -362,7 +370,7 @@ $(eval $(call KernelPackage,nls-iso8859-2))
 
 
 define KernelPackage/nls-iso8859-15
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_15
@@ -380,7 +388,7 @@ $(eval $(call KernelPackage,nls-iso8859-15))
 
 
 define KernelPackage/nls-koi8r
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=KOI8-R (Russian)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_KOI8_R
@@ -398,7 +406,7 @@ $(eval $(call KernelPackage,nls-koi8r))
 
 
 define KernelPackage/nls-utf8
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=UTF-8
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_UTF8
diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index e087598..c36d6a4 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -6,10 +6,10 @@
 #
 # $Id $
 
-I2CMENU:=I2C Bus
+I2C_MENU:=I2C support
 
 define KernelPackage/i2c-core
-  SUBMENU:=$(I2CMENU)
+  SUBMENU:=$(I2C_MENU)
   TITLE:=I2C support
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,i2c-core))
 
 
 define KernelPackage/i2c-algos
-  SUBMENU:=$(I2CMENU)
+  SUBMENU:=$(I2C_MENU)
   TITLE:=I2C algorithms support
   DEPENDS:=kmod-i2c-core
   KCONFIG:= \
@@ -51,7 +51,7 @@ $(eval $(call KernelPackage,i2c-algos))
 
 
 define KernelPackage/i2c-scx200
-  SUBMENU:=$(I2CMENU)
+  SUBMENU:=$(I2C_MENU)
   TITLE:=SCX200 i2c support
   DEFAULT:=y if TARGET_x86_Soekris
   DEPENDS:=@TARGET_x86_Soekris kmod-i2c-core kmod-i2c-algos
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 69671a2..5fe6b57 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -6,11 +6,11 @@
 #
 # $Id$
 
-NFMENU:=Netfilter Extensions
+NF_MENU:=Netfilter Extensions
 include $(INCLUDE_DIR)/netfilter.mk
 
 define KernelPackage/ipt-conntrack
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for connection tracking
   KCONFIG:=$(KCONFIG_IPT_CONNTRACK)
   FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,ipt-conntrack))
 
 
 define KernelPackage/ipt-filter
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for packet content inspection
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -47,7 +47,7 @@ $(eval $(call KernelPackage,ipt-filter))
 
 
 define KernelPackage/ipt-ipopt
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for matching/changing IP packet options
   KCONFIG:=$(KCONFIG_IPT_IPOPT)
   FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -72,7 +72,7 @@ $(eval $(call KernelPackage,ipt-ipopt))
 
 
 define KernelPackage/ipt-ipsec
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for matching IPSec packets
   KCONFIG:=$(KCONFIG_IPT_IPSEC)
   FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -90,7 +90,7 @@ $(eval $(call KernelPackage,ipt-ipsec))
 
 
 define KernelPackage/ipt-nat
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for extra NAT targets
   KCONFIG:=$(KCONFIG_IPT_NAT)
   FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -108,7 +108,7 @@ $(eval $(call KernelPackage,ipt-nat))
 
 
 define KernelPackage/ipt-nathelper
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Default Conntrack and NAT helpers
   KCONFIG:=$(KCONFIG_IPT_NAT_DEFAULT)
   FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -129,7 +129,7 @@ $(eval $(call KernelPackage,ipt-nathelper))
 
 
 define KernelPackage/ipt-nathelper-extra
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Extra Conntrack and NAT helpers
   KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
   FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -153,7 +153,7 @@ $(eval $(call KernelPackage,ipt-nathelper-extra))
 
 
 define KernelPackage/ipt-imq
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Intermediate Queueing support
   KCONFIG:=CONFIG_IP_NF_TARGET_IMQ
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
@@ -168,7 +168,7 @@ $(eval $(call KernelPackage,ipt-imq))
 
 
 define KernelPackage/ipt-queue
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Module for user-space packet queueing
   KCONFIG:=$(KCONFIG_IPT_QUEUE)
   FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -185,7 +185,7 @@ $(eval $(call KernelPackage,ipt-queue))
 
 
 define KernelPackage/ipt-ulog
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Module for user-space packet logging
   KCONFIG:=$(KCONFIG_IPT_ULOG)
   FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -202,7 +202,7 @@ $(eval $(call KernelPackage,ipt-ulog))
 
 
 define KernelPackage/ipt-iprange
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Module for matching ip ranges
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/ipt_iprange.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m)))
@@ -218,7 +218,7 @@ $(eval $(call KernelPackage,ipt-iprange))
 
 
 define KernelPackage/ipt-ipset
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=IPSET Modules
   KCONFIG:=$(KCONFIG_IPT_IPSET)
   FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -233,7 +233,7 @@ $(eval $(call KernelPackage,ipt-ipset))
 
 
 define KernelPackage/ipt-extra
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Extra modules
   KCONFIG:=$(KCONFIG_IPT_EXTRA)
   FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
@@ -256,7 +256,7 @@ $(eval $(call KernelPackage,ipt-extra))
 
 
 define KernelPackage/ip6tables
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=IPv6 modules
   KCONFIG:=CONFIG_IP6_NF_IPTABLES
   FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
@@ -271,7 +271,7 @@ $(eval $(call KernelPackage,ip6tables))
 
 
 define KernelPackage/arptables
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=ARP firewalling modules
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_IP_NF_ARPTABLES
@@ -286,7 +286,7 @@ $(eval $(call KernelPackage,arptables))
 
 
 define KernelPackage/ebtables
-  SUBMENU:=$(NFMENU)
+  SUBMENU:=$(NF_MENU)
   TITLE:=Bridge firewalling modules
   DEPENDS:=@LINUX_2_6
   FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 72e96d4..5117d50 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -6,10 +6,10 @@
 #
 # $Id$
 
-NSMENU:=Network Support
+NETWORK_SUPPORT_MENU:=Network Support
 
 define KernelPackage/atm
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ATM support
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,atm))
 
 
 define KernelPackage/atmtcp
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ATM over TCP
   DEPENDS:=@LINUX_2_6 kmod-atm
   KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y
@@ -45,7 +45,7 @@ $(eval $(call KernelPackage,atmtcp))
 
 
 define KernelPackage/bonding
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Ethernet bonding driver
   KCONFIG:=CONFIG_BONDING
   FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
@@ -60,7 +60,7 @@ $(eval $(call KernelPackage,bonding))
 
 
 define KernelPackage/ipip
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP in IP encapsulation support
   KCONFIG:= \
 	CONFIG_NET_IPIP \
@@ -83,7 +83,7 @@ $(eval $(call KernelPackage,ipip))
 
 
 define KernelPackage/ipsec
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4 and IPv6)
   DEPENDS:=@LINUX_2_6 +kmod-crypto
   KCONFIG:= \
@@ -105,7 +105,7 @@ $(eval $(call KernelPackage,ipsec))
 
 
 define KernelPackage/ipsec4
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4)
   DEPENDS:=kmod-ipsec
   KCONFIG:= \
@@ -131,7 +131,7 @@ $(eval $(call KernelPackage,ipsec4))
 
 
 define KernelPackage/ipsec6
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv6)
   DEPENDS:=kmod-ipsec
   KCONFIG:= \
@@ -159,7 +159,7 @@ $(eval $(call KernelPackage,ipsec6))
 
 
 define KernelPackage/ipv6
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 support
   KCONFIG:= \
 	CONFIG_IPV6 \
@@ -182,7 +182,7 @@ $(eval $(call KernelPackage,ipv6))
 
 
 define KernelPackage/gre
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=GRE support
   KCONFIG:=CONFIG_NET_IPGRE
   FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
@@ -196,7 +196,7 @@ $(eval $(call KernelPackage,gre))
 
 
 define KernelPackage/tun
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Universal TUN/TAP driver
   KCONFIG:=CONFIG_TUN
   FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
@@ -211,7 +211,7 @@ $(eval $(call KernelPackage,tun))
 
 
 define KernelPackage/ppp
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP modules
   KCONFIG:= \
 	CONFIG_PPP \
@@ -245,7 +245,7 @@ $(eval $(call KernelPackage,ppp))
 
 
 define KernelPackage/ppp-synctty
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP sync tty support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_SYNC_TTY
@@ -261,7 +261,7 @@ $(eval $(call KernelPackage,ppp-synctty))
 
 
 define KernelPackage/pppoe
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoE support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPPOE
@@ -278,7 +278,7 @@ $(eval $(call KernelPackage,pppoe))
 
 
 define KernelPackage/pppoa
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoA support
   DEPENDS:=kmod-ppp +kmod-atm
   KCONFIG:=CONFIG_PPPOATM
@@ -294,7 +294,7 @@ $(eval $(call KernelPackage,pppoa))
 
 
 define KernelPackage/ipoa
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPoA support
   DEPENDS:=kmod-atm
   KCONFIG:=CONFIG_ATM_CLIP
@@ -310,7 +310,7 @@ $(eval $(call KernelPackage,ipoa))
 
 
 define KernelPackage/mppe
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Microsoft PPP compression/encryption
   DEPENDS:=kmod-ppp +kmod-crypto
   KCONFIG:= \
@@ -338,7 +338,7 @@ $(eval $(call KernelPackage,mppe))
 
 
 define KernelPackage/sched
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Traffic schedulers
   KCONFIG:=CONFIG_NET_SCHED
   FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
@@ -352,7 +352,7 @@ $(eval $(call KernelPackage,sched))
 
 
 define KernelPackage/ax25
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
   KCONFIG:= \
 	CONFIG_AX25 \
@@ -371,7 +371,7 @@ $(eval $(call KernelPackage,ax25))
 
 
 define KernelPackage/mp-alg
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ECMP caching algorithms
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -398,10 +398,10 @@ endef
 $(eval $(call KernelPackage,mp-alg))
 
 
-NDMENU:=Network Devices
+NETWORK_DEVICES_MENU:=Network Devices
 
 define KernelPackage/natsemi
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=National Semiconductor DP8381x series 
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NATSEMI
@@ -418,7 +418,7 @@ $(eval $(call KernelPackage,natsemi))
 
 
 define KernelPackage/r6040
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RDC Fast-Ethernet support
   DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040
@@ -433,7 +433,7 @@ $(eval $(call KernelPackage,r6040))
 
 
 define KernelPackage/sis900
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SiS 900 Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS900
@@ -449,7 +449,7 @@ $(eval $(call KernelPackage,sis900))
 
 
 define KernelPackage/via-rhine
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Via Rhine ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VIA_RHINE
@@ -465,7 +465,7 @@ $(eval $(call KernelPackage,via-rhine))
 
 
 define KernelPackage/via-velocity
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
   DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_VIA_VELOCITY
@@ -481,7 +481,7 @@ $(eval $(call KernelPackage,via-velocity))
 
 
 define KernelPackage/8139too
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_8139TOO
@@ -497,7 +497,7 @@ $(eval $(call KernelPackage,8139too))
 
 
 define KernelPackage/r8169
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86 
   KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
@@ -513,7 +513,7 @@ $(eval $(call KernelPackage,r8169))
 
 
 define KernelPackage/ne2k-pci
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NE2K_PCI
@@ -531,7 +531,7 @@ $(eval $(call KernelPackage,ne2k-pci))
 
 
 define KernelPackage/ixp4xx-npe
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) IXP4xx ethernet support
   DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_IXP4XX_MAC
@@ -550,7 +550,7 @@ $(eval $(call KernelPackage,ixp4xx-npe))
 
 
 define KernelPackage/e100
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E100
@@ -566,7 +566,7 @@ $(eval $(call KernelPackage,e100))
 
 
 define KernelPackage/e1000
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/1000 cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E1000
@@ -582,7 +582,7 @@ $(eval $(call KernelPackage,e1000))
 
 
 define KernelPackage/3c59x
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_3C59X
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a6b3f2d..79af470 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -6,10 +6,10 @@
 #
 # $Id$
 
-EMENU:=Other modules
+OTHER_MENU:=Other modules
 
 define KernelPackage/crc-itu-t
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC ITU-T V.41 support
   KCONFIG:=CONFIG_CRC_ITU_T
   FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX)
@@ -24,7 +24,7 @@ $(eval $(call KernelPackage,crc-itu-t))
 
 
 define KernelPackage/crypto
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=CryptoAPI modules
   KCONFIG:= \
 	CONFIG_CRYPTO_HMAC=m \
@@ -59,7 +59,7 @@ $(eval $(call KernelPackage,crypto))
 
 
 define KernelPackage/eeprom-93cx6
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=EEPROM 93CX6 support
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_EEPROM_93CX6
@@ -75,7 +75,7 @@ $(eval $(call KernelPackage,eeprom-93cx6))
 
 
 define KernelPackage/lp
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Parallel port and line printer support
   DEPENDS:=@LINUX_2_4
   KCONFIG:= \
@@ -93,7 +93,7 @@ $(eval $(call KernelPackage,lp))
 
 
 define KernelPackage/soundcore
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Sound support
   KCONFIG:= \
 	CONFIG_SOUND \
@@ -157,7 +157,7 @@ $(eval $(call KernelPackage,soundcore))
 
 
 define KernelPackage/loop
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Loopback device support
   KCONFIG:=CONFIG_BLK_DEV_LOOP
   FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
@@ -172,7 +172,7 @@ $(eval $(call KernelPackage,loop))
 
 
 define KernelPackage/nbd
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Network block device support
   KCONFIG:=CONFIG_BLK_DEV_NBD
   FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
@@ -187,7 +187,7 @@ $(eval $(call KernelPackage,nbd))
 
 
 define KernelPackage/capi
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=CAPI Support
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -208,7 +208,7 @@ $(eval $(call KernelPackage,capi))
 
 
 define KernelPackage/pcmcia-core
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=PCMCIA/CardBus support
   DEPENDS:=@PCMCIA_SUPPORT
   KCONFIG:= \
@@ -263,7 +263,7 @@ $(eval $(call KernelPackage,pcmcia-core))
 
 
 define KernelPackage/pcmcia-serial
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Serial devices support
   DEPENDS:=kmod-pcmcia-core
   KCONFIG:= \
@@ -290,7 +290,7 @@ $(eval $(call KernelPackage,pcmcia-serial))
 
 
 define KernelPackage/bluetooth
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
   DEPENDS:=@USB_SUPPORT
   KCONFIG:= \
@@ -358,7 +358,7 @@ $(eval $(call KernelPackage,bluetooth))
 
 
 define KernelPackage/mmc
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=MMC/SD Card Support
   DEPENDS:=@TARGET_at91
   KCONFIG:= \
@@ -380,7 +380,7 @@ $(eval $(call KernelPackage,mmc))
 
 
 define KernelPackage/softdog
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Software watchdog driver
   KCONFIG:=CONFIG_SOFT_WATCHDOG
   AUTOLOAD:=$(call AutoLoad,50,softdog)
@@ -402,7 +402,7 @@ $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/leds-net48xx
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Soekris Net48xx LED support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_LEDS_NET48XX
@@ -418,7 +418,7 @@ $(eval $(call KernelPackage,leds-net48xx))
 
 
 define KernelPackage/nsc-gpio
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi GPIO support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NSC_GPIO
@@ -434,7 +434,7 @@ $(eval $(call KernelPackage,nsc-gpio))
 
 
 define KernelPackage/scx200-gpio
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 GPIO support
   DEPENDS:=@TARGET_x86 kmod-nsc-gpio
   KCONFIG:=CONFIG_SCx200_GPIO
@@ -450,7 +450,7 @@ $(eval $(call KernelPackage,scx200-gpio))
 
 
 define KernelPackage/scx200-wdt
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 Watchdog support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SC1200_WDT
@@ -466,7 +466,7 @@ $(eval $(call KernelPackage,scx200-wdt))
 
 
 define KernelPackage/hwmon
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Hardware monitoring support
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -487,7 +487,7 @@ $(eval $(call KernelPackage,hwmon))
 
 
 define KernelPackage/hwmon-pc87360
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=PC87360 monitoring support
   DEPENDS:=kmod-hwmon
   KCONFIG:=CONFIG_SENSORS_PC87360
@@ -503,7 +503,7 @@ $(eval $(call KernelPackage,hwmon-pc87360))
 
 
 define KernelPackage/input-core
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Input device core
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT
@@ -519,7 +519,7 @@ $(eval $(call KernelPackage,input-core))
 
 
 define KernelPackage/input-evdev
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Input even device
   DEPENDS:=+kmod-input-core
   KCONFIG:=CONFIG_INPUT_EVDEV
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 21f018b..139cdbf 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -6,7 +6,7 @@
 #
 # $Id$
 
-USBMENU:=USB Support
+USB_MENU:=USB Support
 
 ifeq ($(KERNEL),2.4)
   USBNET_DIR:=usb/net
@@ -23,13 +23,13 @@ USBHID_DIR?=hid/usbhid
 USBINPUT_DIR?=input/misc
 
 define usbdep
-  SUBMENU:=$(USBMENU)
+  SUBMENU:=$(USB_MENU)
   DEPENDS:=kmod-usb-core $(1)
 endef
 
 
 define KernelPackage/usb-core
-  SUBMENU:=$(USBMENU)
+  SUBMENU:=$(USB_MENU)
   TITLE:=Support for USB
   DEPENDS:=@USB_SUPPORT
   KCONFIG:=CONFIG_USB
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index c44a628..9e5dab8 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -6,10 +6,10 @@
 #
 # $Id$
 
-WIMENU:=Wireless Drivers
+WIRELESS_MENU:=Wireless Drivers
 
 define KernelPackage/ieee80211
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack
   DEPENDS:=@LINUX_2_6 +kmod-crypto
   KCONFIG:= \
@@ -46,7 +46,7 @@ $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC
@@ -62,7 +62,7 @@ $(eval $(call KernelPackage,ieee80211-softmac))
 
 
 define KernelPackage/net-bcm43xx
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Broadcom BCM43xx driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211-softmac
   KCONFIG:=CONFIG_BCM43XX
@@ -80,7 +80,7 @@ $(eval $(call KernelPackage,net-bcm43xx))
 
 
 define KernelPackage/net-ipw2100
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intel IPW2100 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2100
@@ -98,7 +98,7 @@ $(eval $(call KernelPackage,net-ipw2100))
 
 
 define KernelPackage/net-ipw2200
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intel IPW2200 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2200
@@ -116,7 +116,7 @@ $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO
@@ -132,7 +132,7 @@ $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Hermes 802.11b chipset support
   DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
   KCONFIG:=CONFIG_HERMES
@@ -150,7 +150,7 @@ $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism 2.5 PCI support
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PCI_HERMES
@@ -166,7 +166,7 @@ $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=PLX9052 based PCI adaptor
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PLX_HERMES
@@ -182,7 +182,7 @@ $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54
@@ -198,7 +198,7 @@ $(eval $(call KernelPackage,net-prism54))
 
 
 define KernelPackage/net-zd1211rw
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Zydas ZD1211 support
   DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211 +zd1211-firmware
   KCONFIG:=CONFIG_ZD1211RW