[ar71xx] don't override CONFIG_NF_CT_ACCT

[openwrt/svn-archive/archive.git] / package / kernel / modules / network.mk

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 2ba9fa428e7355e48e619eeda3e5cea44fab4817..7f80fab8aec4a8431e23d276976d4c97602f0ed7 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -64,7 +64,6 @@ define KernelPackage/capi
   TITLE:=CAPI (ISDN) Support
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
-       CONFIG_ISDN \
        CONFIG_ISDN_CAPI \
        CONFIG_ISDN_CAPI_CAPI20 \
        CONFIG_ISDN_CAPIFS
@@ -245,6 +244,7 @@ $(eval $(call KernelPackage,ipv6))
 
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=+kmod-iptunnel4
   TITLE:=IPv6-in-IPv4 tunnelling
 endef
 
@@ -318,30 +318,18 @@ $(eval $(call KernelPackage,tun))
 define KernelPackage/ppp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP modules
+  DEPENDS:=+LINUX_2_6:kmod-crc-ccitt
   KCONFIG:= \
        CONFIG_PPP \
        CONFIG_PPP_ASYNC \
-       CONFIG_SLHC \
-       CONFIG_CRC_CCITT
+       CONFIG_SLHC
   FILES:= \
        $(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/slhc.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/ppp/2.4
   AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
 endef
 
-define KernelPackage/ppp/2.6
-#  KCONFIG+= \
-#      CONFIG_SLHC \
-#      CONFIG_CRC_CCITT
-  FILES+= \
-       $(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
-endef
-
 define KernelPackage/ppp/description
  Kernel modules for PPP support
 endef
@@ -557,6 +545,7 @@ define KernelPackage/r6040
   DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040
   FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,99,r6040)
 endef
 
 define KernelPackage/r6040/description
@@ -581,6 +570,27 @@ endef
 
 $(eval $(call KernelPackage,sis900))
 
+define KernelPackage/sky2
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SysKonnect Yukon2 support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SKY2
+  FILES:=$(LINUX_DIR)/drivers/net/sky2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,sky2)
+endef
+
+define KernelPackage/sky2/description
+  This driver supports Gigabit Ethernet adapters based on the
+  Marvell Yukon 2 chipset:
+  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+  There is companion driver for the older Marvell Yukon and
+  Genesis based adapters: skge.
+endef
+
+$(eval $(call KernelPackage,sky2))
+
 
 define KernelPackage/via-rhine
   SUBMENU:=$(NETWORK_DEVICES_MENU)
@@ -664,25 +674,6 @@ endef
 $(eval $(call KernelPackage,ne2k-pci))
 
 
-define KernelPackage/ixp4xx-npe
-  SUBMENU:=$(NETWORK_DEVICES_MENU)
-  TITLE:=Intel(R) IXP4xx ethernet support
-  DEPENDS:=@TARGET_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)
-  AUTOLOAD:=$(call AutoLoad,20,ixp4xx_npe ixp4xx_qmgr ixp4xx_mac)
-endef
-
-define KernelPackage/ixp4xx-npe/description
- Kernel modules for Intel(R) IXP4xx onboard ethernet.
-endef
-
-$(eval $(call KernelPackage,ixp4xx-npe))
-
-
 define KernelPackage/e100
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/100+ cards kernel support