move target/linux/package/switch to package/, fix a bug in the ipkg dependency handling

[openwrt.git] / target / linux / generic-2.4 / modules.mk

diff --git a/target/linux/generic-2.4/modules.mk b/target/linux/generic-2.4/modules.mk
index e65ef81..540ac71 100644 (file)
--- a/target/linux/generic-2.4/modules.mk
+++ b/target/linux/generic-2.4/modules.mk
@@ -12,9 +12,12 @@ $(eval $(call KMOD_template,GRE,gre,\
 ,CONFIG_NET_IPGRE))
 
 $(eval $(call KMOD_template,IMQ,imq,\
-       $(MODULES_DIR)/kernel/net/*/netfilter/*IMQ*.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.o \
        $(MODULES_DIR)/kernel/drivers/net/imq.o \
 ))
+$(eval $(call KMOD_template,IPIP,ipip,\
+       $(MODULES_DIR)/kernel/net/ipv4/ipip.o \
+,CONFIG_NET_IPIP,,60,ipip))
 
 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
@@ -39,22 +42,14 @@ $(eval $(call KMOD_template,PPPOE,pppoe,\
        $(MODULES_DIR)/kernel/drivers/net/pppoe.o \
 ,CONFIG_PPPOE))
 
-ifneq ($(wildcard $(MODULES_DIR)/kernel/net/sched/*.o),)
-CONFIG_SCHED:=m
-endif
 $(eval $(call KMOD_template,SCHED,sched,\
        $(MODULES_DIR)/kernel/net/sched/*.o \
-,CONFIG_SCHED))
+))
 
 $(eval $(call KMOD_template,TUN,tun,\
        $(MODULES_DIR)/kernel/drivers/net/tun.o \
 ,CONFIG_TUN,,20,tun))
 
-$(eval $(call KMOD_template,RING,ring,\
-       $(MODULES_DIR)/kernel/net/ring/ring.o \
-,CONFIG_RING,,20,ring))
-
-
 # Filtering / Firewalling
 
 $(eval $(call KMOD_template,ARPTABLES,arptables,\
@@ -115,7 +110,7 @@ $(eval $(call KMOD_template,IP6TABLES,ip6tables,\
 $(eval $(call KMOD_template,IDE,ide,\
        $(MODULES_DIR)/kernel/drivers/ide/*.o \
        $(MODULES_DIR)/kernel/drivers/ide/*/*.o \
-,CONFIG_IDE))
+,CONFIG_IDE,,20,pdc202xx_old ide-core ide-detect ide-disk))
 
 $(eval $(call KMOD_template,LOOP,loop,\
     $(MODULES_DIR)/kernel/drivers/block/loop.o \