kernel package cleanup, move madwifi from target/linux/package/ to package/, update...

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

diff --git a/target/linux/generic-2.6/modules.mk b/target/linux/generic-2.6/modules.mk
index f767055..b582400 100644 (file)
--- a/target/linux/generic-2.6/modules.mk
+++ b/target/linux/generic-2.6/modules.mk
@@ -1,3 +1,4 @@
+NF_2_6:=1

 include ../netfilter.mk
 
 # Networking
 include ../netfilter.mk
 
 # Networking


@@ -13,10 +14,14 @@ $(eval $(call KMOD_template,GRE,gre,\
 ,CONFIG_NET_IPGRE))
 
 $(eval $(call KMOD_template,IMQ,imq,\
 ,CONFIG_NET_IPGRE))
 
 $(eval $(call KMOD_template,IMQ,imq,\

-       $(MODULES_DIR)/kernel/net/*/netfilter/*IMQ*.ko \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.ko \

        $(MODULES_DIR)/kernel/drivers/net/imq.ko \
 ))
 
        $(MODULES_DIR)/kernel/drivers/net/imq.ko \
 ))
 

+$(eval $(call KMOD_template,IPIP,ipip,\
+       $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \
+,CONFIG_NET_IPIP,,60,ipip))
+

 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \
 ,CONFIG_IPV6,,20,ipv6))
 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \
 ,CONFIG_IPV6,,20,ipv6))


@@ -65,39 +70,39 @@ $(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\
 ,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd))
 
 $(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\
 ,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd))
 
 $(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\

-       $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\
 ))
 
 $(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\

-       $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\
 ))
 
 $(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\

-       $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\
 ))
 
 $(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\

-       $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\
 ))
 
 $(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\

-       $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_NAT,ipt-nat,\
 ))
 
 $(eval $(call KMOD_template,IPT_NAT,ipt-nat,\

-       $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\
 ))
 
 $(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\

-       $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ,,,40,$(IPT_NAT_EXTRA-m)))
 
 $(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\
 ,,,40,$(IPT_NAT_EXTRA-m)))
 
 $(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\

-       $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\
 ))
 
 $(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\

-       $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+       $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \

 ))
 
 $(eval $(call KMOD_template,IP6TABLES,ip6tables,\
 ))
 
 $(eval $(call KMOD_template,IP6TABLES,ip6tables,\


@@ -327,7 +332,11 @@ $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
 
 $(eval $(call KMOD_template,USB_ATM,usb-atm,\
         $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.ko \
 
 $(eval $(call KMOD_template,USB_ATM,usb-atm,\
         $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.ko \

-       ,CONFIG_USB_ATM,kmod-usb-atm,50,usb-atm))
+       ,CONFIG_USB_ATM,kmod-usb-atm,50,usbatm))
+
+$(eval $(call KMOD_template,USB_ATM_SPEEDTOUCH,usb-atm-speedtouch,\
+        $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.ko \
+       ,CONFIG_USB_SPEEDTOUCH,kmod-usb-atm-speedtouch,50,speedtch))

 
 # Misc. devices
 
 
 # Misc. devices
 


@@ -342,6 +351,7 @@ $(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
        $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \
        $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \
        $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \
        $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \
        $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \
        $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \

-,CONFIG_BLUEZ))
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko \
+,CONFIG_BT))