add a check for brctl in the unbridge() function (fixes #1417)

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 8bc216e..ec307b6 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -263,7 +263,6 @@ define KernelPackage/natsemi
   FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_NATSEMI)
   DEPENDS:=@LINUX_2_6_X86
   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
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef


@@ -323,7 +322,7 @@ define KernelPackage/ne2k-pci
        ne2k-pci Ethernet Adapter kernel support.
   FILES:=$(MODULES_DIR)/kernel/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
        ne2k-pci Ethernet Adapter kernel support.
   FILES:=$(MODULES_DIR)/kernel/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/net/8390.$(LINUX_KMOD_SUFFIX)

-  KCONFIG:=$(CONFIG_NE2K-PCI)
+  KCONFIG:=$(CONFIG_NE2K_PCI)

   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)


@@ -364,6 +363,7 @@ define KernelPackage/e1000
   KCONFIG:=$(CONFIG_E1000)
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
   KCONFIG:=$(CONFIG_E1000)
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)

+  AUTOLOAD:=$(call AutoLoad,50,e1000)

 endef
 $(eval $(call KernelPackage,e1000))
 
 endef
 $(eval $(call KernelPackage,e1000))