Add an MTX-1 specific patch to avoid functions redefinition at compile-time.

[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 318190b..ab8a5f5 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
@@ -25,6 +26,7 @@ $(eval $(call KMOD_template,PPP,ppp,\
        $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \
        $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
        $(MODULES_DIR)/kernel/drivers/net/slhc.ko \
+       $(MODULES_DIR)/kernel/lib/crc-ccitt.ko \
 ,CONFIG_PPP))
 
 #$(eval $(call KMOD_template,MPPE,mppe,\
@@ -64,39 +66,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,\
-       $(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,\
-       $(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,\
-       $(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,\
-       $(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,\
-       $(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,\
-       $(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,\
-       $(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,\
-       $(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,\
-       $(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,\
@@ -133,6 +135,10 @@ $(eval $(call KMOD_template,FS_CIFS,fs-cifs,\
        $(MODULES_DIR)/kernel/fs/cifs/cifs.ko \
 ,CONFIG_CIFS,kmod-nls-base,30,cifs))
 
+$(eval $(call KMOD_template,FS_MINIX,fs-minix,\
+       $(MODULES_DIR)/kernel/fs/minix/minix.ko \
+,CONFIG_MINIX_FS,,30,minix))
+
 $(eval $(call KMOD_template,FS_EXT2,fs-ext2,\
        $(MODULES_DIR)/kernel/fs/ext2/ext2.ko \
 ,CONFIG_EXT2_FS,,30,ext2))
@@ -271,8 +277,8 @@ $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
 ,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd))
 
 $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
-       $(MODULES_DIR)/kernel/drivers/usb/host/uhci.ko \
-,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
+       $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko \
+,CONFIG_USB_UHCI_HCD,kmod-usb-core,60,uhci-hcd))
 
 $(eval $(call KMOD_template,USB2,usb2,\
        $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \
@@ -282,9 +288,9 @@ $(eval $(call KMOD_template,USB_ACM,usb-acm,\
        $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
 ,CONFIG_USB_ACM))
 
-#$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
-#      $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \
-#,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
+$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
+       $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \
+,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
 
 $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
        $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
@@ -322,7 +328,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 \
-       ,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
 
@@ -337,6 +347,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 \
-,CONFIG_BLUEZ))
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko \
+,CONFIG_BT))