remove the obsolete ixp4xx-npe package and references to it (thx, Jose Vasconcellos)

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 5face21..7f80fab 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
@@ -123,7 +122,7 @@ $(eval $(call KernelPackage,ipsec))
 define KernelPackage/ipsec4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4)
-  DEPENDS:=kmod-ipsec +kmod-iptunnel4 +kmod-crypto-aead
+  DEPENDS:=kmod-ipsec +kmod-iptunnel4
   KCONFIG:= \
        CONFIG_INET_AH \
        CONFIG_INET_ESP \
@@ -155,7 +154,7 @@ $(eval $(call KernelPackage,ipsec4))
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv6)
-  DEPENDS:=kmod-ipsec +kmod-iptunnel6 +kmod-crypto-aead
+  DEPENDS:=kmod-ipsec +kmod-iptunnel6
   KCONFIG:= \
        CONFIG_INET6_AH \
        CONFIG_INET6_ESP \
@@ -319,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
@@ -558,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
@@ -686,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