more cleanup

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 9a3f03f..4593e4c 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -10,9 +10,9 @@ NSMENU:=Network Support
 
 define KernelPackage/atm
   TITLE:=ATM support
 
 define KernelPackage/atm
   TITLE:=ATM support

-  DEPENDS:=@ATM_SUPPORT

   DESCRIPTION:= \
     Kernel modules for ATM support
   DESCRIPTION:= \
     Kernel modules for ATM support

+  DEPENDS:=@LINUX_2_6

   FILES:= \
     $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
     $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
   FILES:= \
     $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
     $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)


@@ -28,7 +28,7 @@ define KernelPackage/atmtcp
     Kernel module for ATM over TCP support
   DEPENDS:=@LINUX_2_6 kmod-atm
   FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
     Kernel module for ATM over TCP support
   DEPENDS:=@LINUX_2_6 kmod-atm
   FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)

-  KCONFIG:=CONFIG_ATM_TCP
+  KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y

   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef
   SUBMENU:=$(NSMENU)
   AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef


@@ -38,7 +38,6 @@ define KernelPackage/bonding
   TITLE:=Ethernet bonding driver
   DESCRIPTION:= \
     Kernel module for NIC bonding.
   TITLE:=Ethernet bonding driver
   DESCRIPTION:= \
     Kernel module for NIC bonding.

-  DEPENDS:=@LINUX_2_6_X86

   FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_BONDING
   SUBMENU:=$(NSMENU)
   FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_BONDING
   SUBMENU:=$(NSMENU)


@@ -53,7 +52,6 @@ define KernelPackage/ipip
   KCONFIG:=CONFIG_NET_IPIP
   SUBMENU:=$(NSMENU)
 endef
   KCONFIG:=CONFIG_NET_IPIP
   SUBMENU:=$(NSMENU)
 endef

-$(eval $(call KernelPackage,ipip))

 
 define KernelPackage/ipip/2.4
   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
 
 define KernelPackage/ipip/2.4
   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)


@@ -66,7 +64,7 @@ define KernelPackage/ipip/2.6
        $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
 endef
        $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
 endef

-
+$(eval $(call KernelPackage,ipip))

 
 define KernelPackage/ipsec
   TITLE:=IPsec related modules (IPv4 and IPv6)
 
 define KernelPackage/ipsec
   TITLE:=IPsec related modules (IPv4 and IPv6)


@@ -209,7 +207,7 @@ define KernelPackage/pppoa
   TITLE:=PPPoA support
   DESCRIPTION:=\
        Kernel modules for PPPoA (PPP over ATM) support
   TITLE:=PPPoA support
   DESCRIPTION:=\
        Kernel modules for PPPoA (PPP over ATM) support

-  DEPENDS:=kmod-ppp
+  DEPENDS:=kmod-ppp kmod-atm

   KCONFIG:=CONFIG_PPPOATM
   FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)
   KCONFIG:=CONFIG_PPPOATM
   FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)


@@ -264,6 +262,7 @@ $(eval $(call KernelPackage,ax25))
 
 define KernelPackage/mp-alg
   TITLE:=ECMP caching algorithms
 
 define KernelPackage/mp-alg
   TITLE:=ECMP caching algorithms

+  DEPENDS:=@LINUX_2_6

   DESCRIPTION:= \
        Kernel modules that provide several different algorithms for multipath \\\
        route selection from the route cache. The iproute "mpath" argument allows \\\
   DESCRIPTION:= \
        Kernel modules that provide several different algorithms for multipath \\\
        route selection from the route cache. The iproute "mpath" argument allows \\\


@@ -293,6 +292,17 @@ define KernelPackage/natsemi
 endef
 $(eval $(call KernelPackage,natsemi))
 
 endef
 $(eval $(call KernelPackage,natsemi))
 

+define KernelPackage/r6040
+  TITLE:=RDC Fast-Ethernet support
+  DESCRIPTION:=\
+       Kernel modules for RDC Fast-Ethernet adapters.
+  FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_R6040
+  DEPENDS:=@LINUX_2_6_RDC
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,r6040))
+

 define KernelPackage/sis900
   TITLE:=SiS 900 Ethernet support
   DESCRIPTION:=\
 define KernelPackage/sis900
   TITLE:=SiS 900 Ethernet support
   DESCRIPTION:=\