X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fusb.mk;h=1add87557e8146f4ea6629544335fe1779279480;hb=af2420ac0951b6726c078a6af7820c8b5aa05037;hp=76125a9f5d13df8c3033329d075f2a6106ed360b;hpb=2a36a02bd9f31dd50ada8fae4df8e9e824b45cad;p=openwrt-10.03%2F.git

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 76125a9f5..1add87557 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -8,12 +8,23 @@
 
 USBMENU:=USB Support
 
-# This is 2.6.22 specific
-#ifeq ($(KERNEL),2.4)
-	USBNET_DIR=usb/net
-#else
-#	USBNET_DIR=net/usb
-#endif
+ifeq ($(KERNEL),2.4)
+  USBNET_DIR:=usb/net
+endif
+ifeq ($(KERNEL_PATCHVER),2.6.21)
+  USBNET_DIR:=usb/net
+endif
+USBNET_DIR?=net/usb
+
+ifeq ($(KERNEL_PATCHVER),2.6.21)
+  USBHID_DIR:=drivers/usb/input
+endif
+USBHID_DIR?=drivers/hid/usbhid
+
+ifeq ($(KERNEL_PATCHVER),2.6.21)
+  USBINPUT_DIR:=usb/input
+endif
+USBINPUT_DIR?=input/misc
 
 define usbdep
   SUBMENU:=$(USBMENU)
@@ -245,6 +256,17 @@ define KernelPackage/usb-serial-visor
 endef
 $(eval $(call KernelPackage,usb-serial-visor))
 
+define KernelPackage/usb-serial-option
+  $(call usbdep,kmod-usb-serial)
+  TITLE:=Support for Option HSDPA modems
+  DESCRIPTION:=Kernel support for Option HSDPA modems
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=$(CONFIG_USB_SERIAL_OPTION)
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,option)
+endef
+$(eval $(call KernelPackage,usb-serial-option))
+
 
 define KernelPackage/usb-storage
   $(call usbdep,+kmod-scsi-core)
@@ -389,7 +411,7 @@ define KernelPackage/usb-hid
 endef
 
 define KernelPackage/usb-hid/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/input/usbhid.ko
+  FILES:=$(LINUX_DIR)/$(USBHID_DIR)/usbhid.ko
 endef
 $(eval $(call KernelPackage,usb-hid))
 
@@ -398,7 +420,7 @@ define KernelPackage/usb-yealink
   TITLE:=USB Yealink VOIP phone
   DESCRIPTION:=Kernel support for Yealink VOIP phone
   KCONFIG:=$(CONFIG_USB_YEALINK)
-  FILES:=$(LINUX_DIR)/drivers/usb/input/yealink.ko
+  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
   AUTOLOAD:=$(call AutoLoad,70,yealink)
 endef
 $(eval $(call KernelPackage,usb-yealink))