split modules.mk

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

6 files changed, 603 insertions, 559 deletions

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index bb9fd4f70f..7c81cda0ae 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -69,6 +69,7 @@ define KernelPackage
     EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))'
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
+    $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
   endef
 
   ifeq ($(findstring m,$(KCONFIG)),m)
@@ -87,4 +88,4 @@ define AutoLoad
   add_module $(1) "$(2)";
 endef
 
-include ./modules.mk
+include ./modules/*.mk
diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
deleted file mode 100644
index 6ecab498ae..0000000000
--- a/package/kernel/modules.mk
+++ /dev/null
@@ -1,558 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-
-define KernelPackage/crypto
-  TITLE:=CryptoAPI modules
-  KCONFIG:= \
-	$(CONFIG_CRYPTO_HMAC) \
-	$(CONFIG_CRYPTO_NULL) \
-	$(CONFIG_CRYPTO_MD4) \
-	$(CONFIG_CRYPTO_MD5) \
-	$(CONFIG_CRYPTO_SHA1) \
-	$(CONFIG_CRYPTO_SHA256) \
-	$(CONFIG_CRYPTO_SHA512) \
-	$(CONFIG_CRYPTO_WP512) \
-	$(CONFIG_CRYPTO_TGR192) \
-	$(CONFIG_CRYPTO_DES) \
-	$(CONFIG_CRYPTO_BLOWFISH) \
-	$(CONFIG_CRYPTO_TWOFISH) \
-	$(CONFIG_CRYPTO_SERPENT) \
-	$(CONFIG_CRYPTO_AES) \
-	$(CONFIG_CRYPTO_CAST5) \
-	$(CONFIG_CRYPTO_CAST6) \
-	$(CONFIG_CRYPTO_TEA) \
-	$(CONFIG_CRYPTO_ARC4) \
-	$(CONFIG_CRYPTO_KHAZAD) \
-	$(CONFIG_CRYPTO_ANUBIS) \
-	$(CONFIG_CRYPTO_DEFLATE) \
-	$(CONFIG_CRYPTO_MICHAEL_MIC) \
-	$(CONFIG_CRYPTO_CRC32C)
-  FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX)
-endef
-$(eval $(call KernelPackage,crypto))
-
-define KernelPackage/ide-core
-  TITLE:=Kernel support for IDE
-  DESCRIPTION:=\
-	Useful for usb mass storage devices (e.g. on WL-HDD)\\\
-	\\\
-	Includes: \\\
-	- ide-core \\\
-	- ide-detect \\\
-	- ide-disk
-  KCONFIG:=$(CONFIG_IDE)
-  FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
-endef
-$(eval $(call KernelPackage,ide-core))
-
-define KernelPackage/ide-pdc202xx
-  TITLE:=PDC202xx IDE driver
-  KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD)
-  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
-endef
-$(eval $(call KernelPackage,ide-pdc202xx))
-
-
-define KernelPackage/lp
-  TITLE:=Parallel port and line printer support
-  KCONFIG:=$(CONFIG_PARPORT)
-  FILES:= \
-	$(MODULES_DIR)/kernel/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/parport/parport_*.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50, \
-  	parport \
-  	parport_splink \
-  	lp \
-  )
-endef
-$(eval $(call KernelPackage,lp))
-
-
-WIMENU:=Wireless Drivers
-
-define KernelPackage/bcm43xx
-  TITLE:=Broadcom BCM43xx driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- bcm43xx
-  DEPENDS:=kmod-ieee80211softmac
-  KCONFIG:=$(CONFIG_BCM43XX)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,50,bcm43xx)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,bcm43xx))
-
-define KernelPackage/ipw2100
-  TITLE:=Intel IPw2100 driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ipw2100
-  DEPENDS:=kmod-ieee80211softmac
-  KCONFIG:=$(CONFIG_IPW2100)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,50,ipw2100)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,ipw2100))
-
-define KernelPackage/ipw2200
-  TITLE:=Intel IPw2200 driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ipw2200
-  DEPENDS:=kmod-ieee80211softmac
-  KCONFIG:=$(CONFIG_IPW2200)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,50,ipw2200)
-  SUBMENU:=$(WIMENU)
-endef
-$(eval $(call KernelPackage,ipw2200))
-
-
-NFMENU:=Netfilter Extensions
-
-define KernelPackage/ipt-conntrack
-  TITLE:=Modules for connection tracking
-  DESCRIPTION:=\
-	Netfilter (IPv4) kernel modules for connection tracking\\\
-	\\\
-	Includes: \\\
-	- ipt_conntrack \\\
-	- ipt_helper \\\
-	- ipt_connmark/CONNMARK
-  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-conntrack))
-
-define KernelPackage/ipt-filter
-  TITLE:=Modules for packet content inspection
-  DESCRIPTION:=\
-	Netfilter (IPv4) kernel modules for packet content inspection \\\
-	\\\
-	Includes: \\\
-	- ipt_ipp2p \\\
-	- ipt_layer7
-  FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-filter))
-
-define KernelPackage/ipt-ipopt
-  TITLE:=Modules for matching/changing IP packet options
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for matching/changing IP packet options \\\
-	\\\
-	Includes: \\\
-	- ipt_dscp/DSCP \\\
-	- ipt_ecn/ECN \\\
-	- ipt_length \\\
-	- ipt_mac \\\
-	- ipt_tos/TOS \\\
-	- ipt_tcpmms \\\
-	- ipt_ttl/TTL \\\
-	- ipt_unclean
-  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-ipopt))
-
-define KernelPackage/ipt-ipsec
-  TITLE:=Modules for matching IPSec packets
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for matching IPSec packets \\\
-	\\\
-	Includes: \\\
-	- ipt_ah \\\
-	- ipt_esp
-  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-ipsec))
-
-define KernelPackage/ipt-nat
-  TITLE:=Modules for extra NAT targets
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for extra NAT targets \\\
-	\\\
-	Includes: \\\
-	- ipt_REDIRECT \\\
-	- ipt_NETMAP
-  FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-nat))
-
-define KernelPackage/ipt-nathelper
-  TITLE:=Extra Conntrack and NAT helpers
-  DESCRIPTION:=\
-	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
-	\\\
-	Includes: \\\
-	- ip_conntrack_amanda \\\
-	- ip_conntrack_proto_gre \\\
-	- ip_nat_proto_gre \\\
-	- ip_conntrack_pptp \\\
-	- ip_nat_pptp \\\
-	- ip_conntrack_sip \\\
-	- ip_nat_sip \\\
-	- ip_nat_snmp_basic \\\
-	- ip_conntrack_tftp
-  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-nathelper))
-
-define KernelPackage/ipt-imq
-  TITLE:=Intermediate Queueing support
-  DESCRIPTION:=\
-	Kernel support for Intermediate Queueing devices
-  KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-imq))
-
-
-define KernelPackage/ipt-queue
-  TITLE:=Module for user-space packet queueing
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for user-space packet queueing \\\
-	\\\
-	Includes: \\\
-	- ipt_QUEUE
-  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-queue))
-
-define KernelPackage/ipt-ulog
-  TITLE:=Module for user-space packet logging
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for user-space packet logging \\\
-	\\\
-	Includes: \\\
-	- ipt_ULOG
-  FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-ulog))
-
-define KernelPackage/ipt-extra
-  TITLE:=Extra modules
-  DESCRIPTION:=\
-	Other Netfilter (IPv4) kernel modules\\\
-	Includes: \\\
-	- ipt_limit \\\
-	- ipt_owner \\\
-	- ipt_physdev \\\
-	- ipt_pkttype \\\
-	- ipt_recent
-  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ipt-extra))
-
-define KernelPackage/ip6tables
-  TITLE:=IPv6 modules
-  DESCRIPTION:=\
-	Netfilter IPv6 firewalling support
-  KCONFIG:=$(CONFIG_IP6_NF_IPTABLES)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ip6tables))
-
-
-define KernelPackage/arptables
-  TITLE:=ARP firewalling modules
-  DESCRIPTION:=\
-	Kernel modules for ARP firewalling
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_IP_NF_ARPTABLES)
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,arptables))
-
-
-define KernelPackage/ebtables
-  TITLE:=Bridge firewalling modules
-  DESCRIPTION:=\
-	Kernel modules for Ethernet Bridge firewalling
-  FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
-  SUBMENU:=$(NFMENU)
-endef
-$(eval $(call KernelPackage,ebtables))
-
-NSMENU:=Network Support
-
-define KernelPackage/atm
-  TITLE:=ATM support
-  DEPENDS:=@ATM_SUPPORT
-  DESCRIPTION:= \
-    Kernel modules for ATM support
-  FILES:= \
-    $(MODULES_DIR)/kernel/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
-    $(MODULES_DIR)/kernel/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_ATM)
-  SUBMENU:=$(NSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,atm)
-endef
-$(eval $(call KernelPackage,atm))
-
-define KernelPackage/atmtcp
-  TITLE:=ATM over TCP
-  DESCRIPTION:= \
-    Kernel module for ATM over TCP support
-  DEPENDS:=@LINUX_2_6 kmod-atm
-  FILES:=$(MODULES_DIR)/kernel/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_ATM_TCP)
-  AUTOLOAD:=$(call AutoLoad,40,atmtcp)
-endef
-$(eval $(call KernelPackage,atmtcp))
-
-define KernelPackage/ipip
-  TITLE:=IP in IP encapsulation support
-  DESCRIPTION:=\
-  	Kernel modules for IP in IP encapsulation
-  KCONFIG:=$(CONFIG_NET_IPIP)
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,ipip))
-
-define KernelPackage/ipip/2.4
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ipip)
-endef
-
-define KernelPackage/ipip/2.6
-  FILES:= \
-	$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
-endef
-
-define KernelPackage/ipv6
-  TITLE:=IPv6 support
-  DESCRIPTION:=\
-	Kernel modules for IPv6 support
-  KCONFIG:=$(CONFIG_IPV6)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,ipv6))
-
-
-define KernelPackage/gre
-  TITLE:=GRE support
-  DESCRIPTION:=\
-	Generic Routing Encapsulation support
-  KCONFIG=$(CONFIG_NET_IPGRE)
-  FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,gre))
-
-
-define KernelPackage/tun
-  TITLE:=Universal TUN/TAP driver
-  DESCRIPTION:=\
-	Kernel support for the TUN/TAP tunneling device
-  KCONFIG:=$(CONFIG_TUN)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,tun)
-endef
-$(eval $(call KernelPackage,tun))
-
-
-define KernelPackage/ppp
-  TITLE:=PPP modules
-  DESCRIPTION:=\
-	Kernel modules for PPP support
-  KCONFIG:=$(CONFIG_PPP)
-  SUBMENU:=$(NSMENU)
-endef
-
-define KernelPackage/ppp/2.6
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko $(MODULES_DIR)/kernel/drivers/net/slhc.ko $(MODULES_DIR)/kernel/lib/crc-ccitt.ko
-  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt)
-endef
-
-define KernelPackage/ppp/2.4
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o $(MODULES_DIR)/kernel/drivers/net/slhc.o
-endef
-$(eval $(call KernelPackage,ppp))
-
-
-define KernelPackage/pppoe
-  TITLE:=PPPoE support
-  DESCRIPTION:=\
-	Kernel modules for PPPoE (PPP over Ethernet) support
-  DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPPOE)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,pppoe))
-
-
-define KernelPackage/pppoa
-  TITLE:=PPPoA support
-  DESCRIPTION:=\
-	Kernel modules for PPPoA (PPP over ATM) support
-  DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPPOATM)
-  FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,pppoa))
-
-
-define KernelPackage/mppe
-  TITLE:=Microsoft PPP compression/encryption
-  DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
-  DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPP_MPPE)
-  SUBMENU:=$(NSMENU)
-endef
-
-define KernelPackage/mppe/2.4
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/mppe/2.6
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
-endef
-$(eval $(call KernelPackage,mppe))
-
-
-define KernelPackage/sched
-  TITLE:=Traffic schedulers
-  DESCRIPTION:=\
-	Kernel schedulers for IP traffic
-  FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,sched))
-
-
-define KernelPackage/ieee80211softmac
-  TITLE:=802.11 Networking stack
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ieee80211_crypt \\\
-	- ieee80211 \\\
-	- ieee80211_crypt_wep \\\
-	- ieee80211_crypt_tkip \\\
-	- ieee80211_crytp_ccmp \\\
-	- ieee80211softmac
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
-  FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,10, \
-	ieee80211_crypt \
-	ieee80211 \
-	ieee80211_crypt_wep \
-	ieee80211_crypt_tkip \
-	ieee80211_crypt_ccmp \
-	ieee80211softmac \
-  )
-  SUBMENU:=$(NSMENU)
-endef
-$(eval $(call KernelPackage,ieee80211softmac))
-
-
-
-NDMENU:=Network Devices
-
-define KernelPackage/natsemi
-  TITLE:=National Semiconductor DP8381x series 
-  DESCRIPTION:=\
-	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
-	adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_NATSEMI)
-  DEPENDS:=@LINUX_2_6_X86
-  DEFAULT:=y
-  SUBMENU:=$(NDMENU)
-  AUTOLOAD:=$(call AutoLoad,20,natsemi)
-endef
-$(eval $(call KernelPackage,natsemi))
-
-define KernelPackage/sis900
-  TITLE:=SiS 900 Ethernet support
-  DESCRIPTION:=\
-	Kernel modules for Sis 900 Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_SIS900)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
-  SUBMENU:=$(NDMENU)
-endef
-$(eval $(call KernelPackage,sis900))
-
-define KernelPackage/via-rhine
-  TITLE:=Via Rhine ethernet support
-  DESCRIPTION:=\
-	Kernel modules for Via Rhine Ethernet chipsets.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_VIA_RHINE)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
-  SUBMENU:=$(NDMENU)
-endef
-$(eval $(call KernelPackage,via-rhine))
-
-define KernelPackage/8139too
-  TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
-  DESCRIPTION:=\
-	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_8139TOO)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
-  SUBMENU:=$(NDMENU)
-endef
-$(eval $(call KernelPackage,8139too))
-
-define KernelPackage/e100
-  TITLE:=Intel(R) PRO/100+ cards kernel support
-  DESCRIPTION:=\
-	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_E100)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
-  SUBMENU:=$(NDMENU)
-endef
-$(eval $(call KernelPackage,e100))
-
-define KernelPackage/3c59x
-  TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
-  DESCRIPTION:=\
-	This option enables driver support for a large number of 10mbps and \\\
-	10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters: \\\
-	- "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \\\
-	- "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI \\\
-	- "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \\\
-	- "Tornado"   (3c905)                                  PCI  \\\
-	- "Hurricane" (3c555/3cSOHO)                           PCI 
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_3C59X)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
-  SUBMENU:=$(NDMENU)
-endef
-$(eval $(call KernelPackage,3c59x))
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
new file mode 100644
index 0000000000..6f3994c121
--- /dev/null
+++ b/package/kernel/modules/netfilter.mk
@@ -0,0 +1,185 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+NFMENU:=Netfilter Extensions
+
+define KernelPackage/ipt-conntrack
+  TITLE:=Modules for connection tracking
+  DESCRIPTION:=\
+	Netfilter (IPv4) kernel modules for connection tracking\\\
+	\\\
+	Includes: \\\
+	- ipt_conntrack \\\
+	- ipt_helper \\\
+	- ipt_connmark/CONNMARK
+  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-conntrack))
+
+define KernelPackage/ipt-filter
+  TITLE:=Modules for packet content inspection
+  DESCRIPTION:=\
+	Netfilter (IPv4) kernel modules for packet content inspection \\\
+	\\\
+	Includes: \\\
+	- ipt_ipp2p \\\
+	- ipt_layer7
+  FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-filter))
+
+define KernelPackage/ipt-ipopt
+  TITLE:=Modules for matching/changing IP packet options
+  DESCRIPTION:=\
+	Netfilter (IPv4) modules for matching/changing IP packet options \\\
+	\\\
+	Includes: \\\
+	- ipt_dscp/DSCP \\\
+	- ipt_ecn/ECN \\\
+	- ipt_length \\\
+	- ipt_mac \\\
+	- ipt_tos/TOS \\\
+	- ipt_tcpmms \\\
+	- ipt_ttl/TTL \\\
+	- ipt_unclean
+  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-ipopt))
+
+define KernelPackage/ipt-ipsec
+  TITLE:=Modules for matching IPSec packets
+  DESCRIPTION:=\
+	Netfilter (IPv4) modules for matching IPSec packets \\\
+	\\\
+	Includes: \\\
+	- ipt_ah \\\
+	- ipt_esp
+  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-ipsec))
+
+define KernelPackage/ipt-nat
+  TITLE:=Modules for extra NAT targets
+  DESCRIPTION:=\
+	Netfilter (IPv4) modules for extra NAT targets \\\
+	\\\
+	Includes: \\\
+	- ipt_REDIRECT \\\
+	- ipt_NETMAP
+  FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-nat))
+
+define KernelPackage/ipt-nathelper
+  TITLE:=Extra Conntrack and NAT helpers
+  DESCRIPTION:=\
+	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
+	\\\
+	Includes: \\\
+	- ip_conntrack_amanda \\\
+	- ip_conntrack_proto_gre \\\
+	- ip_nat_proto_gre \\\
+	- ip_conntrack_pptp \\\
+	- ip_nat_pptp \\\
+	- ip_conntrack_sip \\\
+	- ip_nat_sip \\\
+	- ip_nat_snmp_basic \\\
+	- ip_conntrack_tftp
+  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-nathelper))
+
+define KernelPackage/ipt-imq
+  TITLE:=Intermediate Queueing support
+  DESCRIPTION:=\
+	Kernel support for Intermediate Queueing devices
+  KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ)
+  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-imq))
+
+
+define KernelPackage/ipt-queue
+  TITLE:=Module for user-space packet queueing
+  DESCRIPTION:=\
+	Netfilter (IPv4) module for user-space packet queueing \\\
+	\\\
+	Includes: \\\
+	- ipt_QUEUE
+  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-queue))
+
+define KernelPackage/ipt-ulog
+  TITLE:=Module for user-space packet logging
+  DESCRIPTION:=\
+	Netfilter (IPv4) module for user-space packet logging \\\
+	\\\
+	Includes: \\\
+	- ipt_ULOG
+  FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-ulog))
+
+define KernelPackage/ipt-extra
+  TITLE:=Extra modules
+  DESCRIPTION:=\
+	Other Netfilter (IPv4) kernel modules\\\
+	Includes: \\\
+	- ipt_limit \\\
+	- ipt_owner \\\
+	- ipt_physdev \\\
+	- ipt_pkttype \\\
+	- ipt_recent
+  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-extra))
+
+define KernelPackage/ip6tables
+  TITLE:=IPv6 modules
+  DESCRIPTION:=\
+	Netfilter IPv6 firewalling support
+  KCONFIG:=$(CONFIG_IP6_NF_IPTABLES)
+  FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ip6tables))
+
+
+define KernelPackage/arptables
+  TITLE:=ARP firewalling modules
+  DESCRIPTION:=\
+	Kernel modules for ARP firewalling
+  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_IP_NF_ARPTABLES)
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,arptables))
+
+
+define KernelPackage/ebtables
+  TITLE:=Bridge firewalling modules
+  DESCRIPTION:=\
+	Kernel modules for Ethernet Bridge firewalling
+  FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
+  SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ebtables))
+
+
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
new file mode 100644
index 0000000000..bbd694bf3e
--- /dev/null
+++ b/package/kernel/modules/network.mk
@@ -0,0 +1,277 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+NSMENU:=Network Support
+
+define KernelPackage/atm
+  TITLE:=ATM support
+  DEPENDS:=@ATM_SUPPORT
+  DESCRIPTION:= \
+    Kernel modules for ATM support
+  FILES:= \
+    $(MODULES_DIR)/kernel/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
+    $(MODULES_DIR)/kernel/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_ATM)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,atm)
+endef
+$(eval $(call KernelPackage,atm))
+
+define KernelPackage/atmtcp
+  TITLE:=ATM over TCP
+  DESCRIPTION:= \
+    Kernel module for ATM over TCP support
+  DEPENDS:=@LINUX_2_6 kmod-atm
+  FILES:=$(MODULES_DIR)/kernel/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_ATM_TCP)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,40,atmtcp)
+endef
+$(eval $(call KernelPackage,atmtcp))
+
+define KernelPackage/ipip
+  TITLE:=IP in IP encapsulation support
+  DESCRIPTION:=\
+  	Kernel modules for IP in IP encapsulation
+  KCONFIG:=$(CONFIG_NET_IPIP)
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,ipip))
+
+define KernelPackage/ipip/2.4
+  FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ipip)
+endef
+
+define KernelPackage/ipip/2.6
+  FILES:= \
+	$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
+endef
+
+define KernelPackage/ipv6
+  TITLE:=IPv6 support
+  DESCRIPTION:=\
+	Kernel modules for IPv6 support
+  KCONFIG:=$(CONFIG_IPV6)
+  FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,ipv6))
+
+
+define KernelPackage/gre
+  TITLE:=GRE support
+  DESCRIPTION:=\
+	Generic Routing Encapsulation support
+  KCONFIG=$(CONFIG_NET_IPGRE)
+  FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,gre))
+
+
+define KernelPackage/tun
+  TITLE:=Universal TUN/TAP driver
+  DESCRIPTION:=\
+	Kernel support for the TUN/TAP tunneling device
+  KCONFIG:=$(CONFIG_TUN)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,tun)
+endef
+$(eval $(call KernelPackage,tun))
+
+
+define KernelPackage/ppp
+  TITLE:=PPP modules
+  DESCRIPTION:=\
+	Kernel modules for PPP support
+  KCONFIG:=$(CONFIG_PPP)
+  SUBMENU:=$(NSMENU)
+endef
+
+define KernelPackage/ppp/2.6
+  FILES:= \
+  	$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \
+	$(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
+	$(MODULES_DIR)/kernel/drivers/net/slhc.ko \
+	$(MODULES_DIR)/kernel/lib/crc-ccitt.ko
+  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt)
+endef
+
+define KernelPackage/ppp/2.4
+  FILES:= \
+  	$(MODULES_DIR)/kernel/drivers/net/ppp_async.o \
+	$(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
+	$(MODULES_DIR)/kernel/drivers/net/slhc.o
+endef
+$(eval $(call KernelPackage,ppp))
+
+
+define KernelPackage/pppoe
+  TITLE:=PPPoE support
+  DESCRIPTION:=\
+	Kernel modules for PPPoE (PPP over Ethernet) support
+  DEPENDS:=kmod-ppp
+  KCONFIG:=$(CONFIG_PPPOE)
+  FILES:= \
+  	$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,pppoe))
+
+
+define KernelPackage/pppoa
+  TITLE:=PPPoA support
+  DESCRIPTION:=\
+	Kernel modules for PPPoA (PPP over ATM) support
+  DEPENDS:=kmod-ppp
+  KCONFIG:=$(CONFIG_PPPOATM)
+  FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,pppoa))
+
+
+define KernelPackage/mppe
+  TITLE:=Microsoft PPP compression/encryption
+  DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
+  DEPENDS:=kmod-ppp
+  KCONFIG:=$(CONFIG_PPP_MPPE)
+  SUBMENU:=$(NSMENU)
+endef
+
+define KernelPackage/mppe/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/mppe/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,mppe))
+
+
+define KernelPackage/sched
+  TITLE:=Traffic schedulers
+  DESCRIPTION:=\
+	Kernel schedulers for IP traffic
+  FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,sched))
+
+
+define KernelPackage/ieee80211softmac
+  TITLE:=802.11 Networking stack
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ieee80211_crypt \\\
+	- ieee80211 \\\
+	- ieee80211_crypt_wep \\\
+	- ieee80211_crypt_tkip \\\
+	- ieee80211_crytp_ccmp \\\
+	- ieee80211softmac
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+  FILES:= \
+  	$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,10, \
+	ieee80211_crypt \
+	ieee80211 \
+	ieee80211_crypt_wep \
+	ieee80211_crypt_tkip \
+	ieee80211_crypt_ccmp \
+	ieee80211softmac \
+  )
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,ieee80211softmac))
+
+
+
+NDMENU:=Network Devices
+
+define KernelPackage/natsemi
+  TITLE:=National Semiconductor DP8381x series 
+  DESCRIPTION:=\
+	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
+	adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_NATSEMI)
+  DEPENDS:=@LINUX_2_6_X86
+  DEFAULT:=y
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,20,natsemi)
+endef
+$(eval $(call KernelPackage,natsemi))
+
+define KernelPackage/sis900
+  TITLE:=SiS 900 Ethernet support
+  DESCRIPTION:=\
+	Kernel modules for Sis 900 Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_SIS900)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,sis900))
+
+define KernelPackage/via-rhine
+  TITLE:=Via Rhine ethernet support
+  DESCRIPTION:=\
+	Kernel modules for Via Rhine Ethernet chipsets.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_VIA_RHINE)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,via-rhine))
+
+define KernelPackage/8139too
+  TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
+  DESCRIPTION:=\
+	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_8139TOO)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,8139too))
+
+define KernelPackage/e100
+  TITLE:=Intel(R) PRO/100+ cards kernel support
+  DESCRIPTION:=\
+	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_E100)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,e100))
+
+define KernelPackage/3c59x
+  TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
+  DESCRIPTION:=\
+	This option enables driver support for a large number of 10mbps and \\\
+	10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters: \\\
+	- "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \\\
+	- "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI \\\
+	- "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \\\
+	- "Tornado"   (3c905)                                  PCI  \\\
+	- "Hurricane" (3c555/3cSOHO)                           PCI 
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_3C59X)
+  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,3c59x))
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
new file mode 100644
index 0000000000..0670a3ce1c
--- /dev/null
+++ b/package/kernel/modules/other.mk
@@ -0,0 +1,85 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+EMENU:=Other modules
+
+define KernelPackage/crypto
+  TITLE:=CryptoAPI modules
+  KCONFIG:= \
+	$(CONFIG_CRYPTO_HMAC) \
+	$(CONFIG_CRYPTO_NULL) \
+	$(CONFIG_CRYPTO_MD4) \
+	$(CONFIG_CRYPTO_MD5) \
+	$(CONFIG_CRYPTO_SHA1) \
+	$(CONFIG_CRYPTO_SHA256) \
+	$(CONFIG_CRYPTO_SHA512) \
+	$(CONFIG_CRYPTO_WP512) \
+	$(CONFIG_CRYPTO_TGR192) \
+	$(CONFIG_CRYPTO_DES) \
+	$(CONFIG_CRYPTO_BLOWFISH) \
+	$(CONFIG_CRYPTO_TWOFISH) \
+	$(CONFIG_CRYPTO_SERPENT) \
+	$(CONFIG_CRYPTO_AES) \
+	$(CONFIG_CRYPTO_CAST5) \
+	$(CONFIG_CRYPTO_CAST6) \
+	$(CONFIG_CRYPTO_TEA) \
+	$(CONFIG_CRYPTO_ARC4) \
+	$(CONFIG_CRYPTO_KHAZAD) \
+	$(CONFIG_CRYPTO_ANUBIS) \
+	$(CONFIG_CRYPTO_DEFLATE) \
+	$(CONFIG_CRYPTO_MICHAEL_MIC) \
+	$(CONFIG_CRYPTO_CRC32C)
+  FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(EMENU)
+endef
+$(eval $(call KernelPackage,crypto))
+
+define KernelPackage/ide-core
+  TITLE:=Kernel support for IDE
+  DESCRIPTION:=\
+	Useful for usb mass storage devices (e.g. on WL-HDD)\\\
+	\\\
+	Includes: \\\
+	- ide-core \\\
+	- ide-detect \\\
+	- ide-disk
+  KCONFIG:=$(CONFIG_IDE)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+endef
+$(eval $(call KernelPackage,ide-core))
+
+define KernelPackage/ide-pdc202xx
+  TITLE:=PDC202xx IDE driver
+  KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
+endef
+$(eval $(call KernelPackage,ide-pdc202xx))
+
+
+define KernelPackage/lp
+  TITLE:=Parallel port and line printer support
+  KCONFIG:=$(CONFIG_PARPORT)
+  FILES:= \
+	$(MODULES_DIR)/kernel/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/parport/parport_*.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,50, \
+  	parport \
+  	parport_splink \
+  	lp \
+  )
+endef
+$(eval $(call KernelPackage,lp))
+
+
+
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
new file mode 100644
index 0000000000..73ee125fc1
--- /dev/null
+++ b/package/kernel/modules/wireless.mk
@@ -0,0 +1,54 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+WIMENU:=Wireless Drivers
+
+define KernelPackage/bcm43xx
+  TITLE:=Broadcom BCM43xx driver
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- bcm43xx
+  DEPENDS:=kmod-ieee80211softmac
+  KCONFIG:=$(CONFIG_BCM43XX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,50,bcm43xx)
+  SUBMENU:=$(WIMENU)
+endef
+$(eval $(call KernelPackage,bcm43xx))
+
+define KernelPackage/ipw2100
+  TITLE:=Intel IPw2100 driver
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ipw2100
+  DEPENDS:=kmod-ieee80211softmac
+  KCONFIG:=$(CONFIG_IPW2100)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,50,ipw2100)
+  SUBMENU:=$(WIMENU)
+endef
+$(eval $(call KernelPackage,ipw2100))
+
+define KernelPackage/ipw2200
+  TITLE:=Intel IPw2200 driver
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ipw2200
+  DEPENDS:=kmod-ieee80211softmac
+  KCONFIG:=$(CONFIG_IPW2200)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,50,ipw2200)
+  SUBMENU:=$(WIMENU)
+endef
+$(eval $(call KernelPackage,ipw2200))
+
+
+