X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1dfd43820e4ea15c6cfe80175da0d436bbce74c8..e94e9040c477dcb36eac01c79322dfdb30a1d0db:/package/kernel/modules/usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index ad037d619..04aeb2a10 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -8,6 +8,13 @@
 
 USBMENU:=USB Support
 
+# This is 2.6.22 specific
+#ifeq ($(KERNEL),2.4)
+	USBNET_DIR=usb/net
+#else
+#	USBNET_DIR=net/usb
+#endif
+
 define KernelPackage/usb-core
   TITLE:=Support for USB
   DESCRIPTION:=Kernel support for USB
@@ -264,20 +271,35 @@ define KernelPackage/usb-storage
 endef
 $(eval $(call KernelPackage,usb-storage))
 
-
+define KernelPackage/usb-atm
+  $(call usbdep,@LINUX_2_6 kmod-atm)
+  TITLE:=Support for ATM on USB bus
+  DESCRIPTION:=Kernel support for USB DSL modems
+  KCONFIG:=$(CONFIG_USB_ATM)
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,usbatm)
+endef
+$(eval $(call KernelPackage,usb-atm))
 
 define KernelPackage/usb-speedtouch
   $(call usbdep,@LINUX_2_6 kmod-atm)
   TITLE:=Support for SpeedTouch ADSL modems
   DESCRIPTION:=Kernel support for SpeedTouch USB ADSL modems
   KCONFIG:=$(CONFIG_USB_SPEEDTOUCH)
-  FILES:= \
-	$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,speedtch)
 endef
 $(eval $(call KernelPackage,usb-speedtouch))
 
+define KernelPackage/ueagle-atm
+  $(call usbdep,@LINUX_2_6 kmod-atm)
+  TITLE:=Driver for Eagle 8051 based USB ADSL modems
+  DESCRIPTION:=Kernel support for Eagle 8051 based USB ADSL modems
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_USB_UEAGLEATM)
+  AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
+endef
+$(eval $(call KernelPackage,ueagle-atm))
 
 define KernelPackage/usb-pwc
   $(call usbdep,+kmod-videodev)
@@ -291,6 +313,9 @@ define KernelPackage/usb-pwc/2.4
   FILES:=$(LINUX_DIR)/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX)
 endef
 
+define KernelPackage/usb-pwc/2.6
+  FILES:=$(LINUX_DIR)/drivers/usb/media/pwc/pwc.$(LINUX_KMOD_SUFFIX)
+endef
 $(eval $(call KernelPackage,usb-pwc))
 
 define KernelPackage/usb-net
@@ -307,7 +332,7 @@ define KernelPackage/usb-net/2.4
 endef
 
 define KernelPackage/usb-net/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.$(LINUX_KMOD_SUFFIX)
 endef
 
 $(eval $(call KernelPackage,usb-net))
@@ -326,24 +351,46 @@ define KernelPackage/usb-net-asix/2.4
 endef
 
 define KernelPackage/usb-net-asix/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call Autoload,61,asix)
 endef
 
 $(eval $(call KernelPackage,usb-net-asix))
 
+define KernelPackage/usb-net-kaweth
+  $(call usbdep,+kmod-usbnet)
+  TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
+  DESCRIPTION:=Kernel module for USB-to-Ethernet Kaweth convertors
+  DEPENDS:=kmod-usb-net
+  KCONFIG:=$(CONFIG_USB_KAWETH)
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,61,kaweth)
+endef
+
+$(eval $(call KernelPackage,usb-net-kaweth))
+
+define KernelPackage/usb-net-pegasus
+  $(call usbdep,+kmod-usbnet)
+  TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
+  DESCRIPTION:=Kernel module for USB-to-Ethernet Pegasus convertors
+  DEPENDS:=kmod-usb-net
+  KCONFIG:=$(CONFIG_USB_PEGASUS)
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,61,pegasus)
+endef
+
+$(eval $(call KernelPackage,usb-net-pegasus))
+
 define KernelPackage/usb-hid
-  $(call usbdep,@LINUX_2_6)
+  $(call usbdep,@LINUX_2_6 evdev)
   TITLE:=Support for USB Human Input Devices
   DESCRIPTION:=Kernel support for USB HID devices such as keyboards and mice
   KCONFIG:=$(CONFIG_USB_HID)
-  AUTOLOAD:=$(call AutoLoad,70,usbhid evdev)
+  AUTOLOAD:=$(call AutoLoad,70,usbhid)
 endef
 
 define KernelPackage/usb-hid/2.6
-  FILES:= \
-  	$(LINUX_DIR)/drivers/usb/input/usbhid.ko \
-	$(LINUX_DIR)/drivers/input/evdev.ko
+  FILES:=$(LINUX_DIR)/drivers/usb/input/usbhid.ko
 endef
 $(eval $(call KernelPackage,usb-hid))