Bluetooth depends on USB for 2.6 kernels also

[openwrt.git] / package / kernel / modules / network.mk

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 000d520..05355b3 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -34,6 +34,17 @@ define KernelPackage/atmtcp
 endef
 $(eval $(call KernelPackage,atmtcp))
 
+define KernelPackage/bonding
+  TITLE:=Ethernet bonding driver
+  DESCRIPTION:= \
+    Kernel module for NIC bonding.
+  DEPENDS:=@LINUX_2_6_X86
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_BONDING)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,40,bonding)
+endef
+$(eval $(call KernelPackage,bonding))
 
 define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
@@ -115,9 +126,16 @@ define KernelPackage/ipv6
   DESCRIPTION:=\
        Kernel modules for IPv6 support
   KCONFIG:=$(CONFIG_IPV6)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
 endef
+define KernelPackage/ipv6/2.4
+  FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+endef
+define KernelPackage/ipv6/2.6
+  FILES:= \
+       $(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
+endef
 $(eval $(call KernelPackage,ipv6))
 
 
@@ -252,7 +270,6 @@ define KernelPackage/natsemi
   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
@@ -310,11 +327,12 @@ define KernelPackage/ne2k-pci
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DESCRIPTION:=\
        ne2k-pci Ethernet Adapter kernel support.
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_NE2K-PCI)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_NE2K_PCI)
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
-  AUTOLOAD:=$(call AutoLoad,50,ne2k-pci)
+  AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
 endef
 $(eval $(call KernelPackage,ne2k-pci))
 
@@ -352,6 +370,7 @@ define KernelPackage/e1000
   KCONFIG:=$(CONFIG_E1000)
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,e1000)
 endef
 $(eval $(call KernelPackage,e1000))