upgrade to Linux 2.6.16, yay

[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 f450e4b..d5b1867 100644 (file)
--- a/target/linux/generic-2.6/modules.mk
+++ b/target/linux/generic-2.6/modules.mk
@@ -25,6 +25,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,\
@@ -133,6 +134,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))
@@ -220,10 +225,6 @@ $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \
 ,CONFIG_AIRO,,10,airo))
 
-$(eval $(call KMOD_template,NET_B44,net-b44,\
-       $(MODULES_DIR)/kernel/drivers/net/b44.ko \
-,CONFIG_B44,,10,b44))
-
 $(eval $(call KMOD_template,NET_E100,net-e100,\
        $(MODULES_DIR)/kernel/drivers/net/e100.ko \
 ,CONFIG_E100,,10,e100))
@@ -275,8 +276,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 \
@@ -286,9 +287,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 \
@@ -326,7 +327,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
 
@@ -341,6 +346,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))