X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fusb.mk;h=23413a8e351f8b06829ffd9e3a756c83e272624b;hp=22c1d0b2a374187c56e276ef2badc894dac66772;hb=7010db5df8e81f4aa5b2f19e44b4d87606550ddc;hpb=eb8543e3a7d477dad504d96c5faa4e1e3c91402e

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 22c1d0b2a3..23413a8e35 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -90,6 +90,16 @@ define KernelPackage/usb-ohci/2.6
 endef
 $(eval $(call KernelPackage,usb-ohci))
 
+define KernelPackage/usb-adm5120
+  $(call usbdep,@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB)
+  TITLE:=Support for the ADM5120 HCD controller
+  DESCRIPTION:=Kernel support for the ADM5120 HCD USB controller
+  KCONFIG:=CONFIG_USB_ADM5120_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd)
+endef
+$(eval $(call KernelPackage,usb-adm5120))
+
 define KernelPackage/usb2
   $(call usbdep,)
   TITLE:=Support for USB2 controllers
@@ -171,7 +181,7 @@ endef
 $(eval $(call KernelPackage,usb-serial))
 
 define KernelPackage/usb-serial-airprime
-  $(call usbdep,kmod-usb-serial)
+  $(call usbdep,kmod-usb-serial @LINUX_2_6)
   TITLE:=Support for Airprime (EVDO) 
   DESCRIPTION:=Kernel support for Airprime (EVDO) 
   KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
@@ -224,7 +234,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
 define KernelPackage/usb-serial-sierrawireless
-  $(call usbdep,kmod-usb-serial)
+  $(call usbdep,kmod-usb-serial @LINUX_2_6)
   TITLE:=Support for Sierra Wireless devices
   DESCRIPTION:=Kernel support for Sierra Wireless devices
   KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
@@ -244,11 +254,33 @@ define KernelPackage/usb-serial-visor
 endef
 $(eval $(call KernelPackage,usb-serial-visor))
 
-define KernelPackage/usb-serial-option
+define KernelPackage/usb-serial-keyspan
   $(call usbdep,kmod-usb-serial)
+  TITLE:=Support for Keyspan USB-to-Serial devices
+  DESCRIPTION:=Kernel support for Keyspan USB-to-Serial devices
+  KCONFIG:= \
+		$(CONFIG_USB_SERIAL_KEYSPAN) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA28) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA28X) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA28XA) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA28XB) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA19) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA18X) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA19W) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA19QW) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA19QI) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_MPR) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA49W) \
+		$(CONFIG_USB_SERIAL_KEYSPAN_USA49WLC)
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,keyspan)
+endef
+$(eval $(call KernelPackage,usb-serial-keyspan))
+
+define KernelPackage/usb-serial-option
+  $(call usbdep,kmod-usb-serial @LINUX_2_6)
   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)
@@ -302,31 +334,18 @@ define KernelPackage/usb-pwc
   TITLE:=Philips WebCam driver
   DESCRIPTION:=Kernel modules for supporting Philips WebCam USB devices
   KCONFIG:=CONFIG_USB_PWC CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_PWC_DEBUG=n
+  FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,pwc)
 endef
 
-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/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX)
-endef
 $(eval $(call KernelPackage,usb-pwc))
 
 define KernelPackage/cpia2
-  $(call usbdep,+kmod-videodev)
+  $(call usbdep,+kmod-videodev @LINUX_2_6)
   TITLE:=CPIA2 video driver
   DESCRIPTION:=Kernel modules for CPIA2 WebCam devices
   KCONFIG:=CONFIG_VIDEO_CPIA2
   AUTOLOAD:=$(call AutoLoad,70,cpia2)
-endef
-
-define KernelPackage/cpia2/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/cpia2.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/cpia2/2.6
   FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,cpia2))
@@ -350,18 +369,10 @@ endef
 $(eval $(call KernelPackage,usb-net))
 
 define KernelPackage/usb-net-asix
-  $(call usbdep,kmod-usbnet)
+  $(call usbdep,kmod-usb-net @LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Asix convertors
   DESCRIPTION:=Kernel module for USB-to-Ethernet Asix convertors
   KCONFIG:=CONFIG_USB_NET_AX8817X
-endef
-
-define KernelPackage/usb-net-asix/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,ax8817x)
-endef
-
-define KernelPackage/usb-net-asix/2.6
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call Autoload,61,asix)
 endef
@@ -369,7 +380,7 @@ endef
 $(eval $(call KernelPackage,usb-net-asix))
 
 define KernelPackage/usb-net-kaweth
-  $(call usbdep,kmod-usbnet)
+  $(call usbdep,kmod-usb-net @LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
   DESCRIPTION:=Kernel module for USB-to-Ethernet Kaweth convertors
   KCONFIG:=CONFIG_USB_KAWETH
@@ -380,7 +391,7 @@ endef
 $(eval $(call KernelPackage,usb-net-kaweth))
 
 define KernelPackage/usb-net-pegasus
-  $(call usbdep,kmod-usbnet)
+  $(call usbdep,kmod-usb-net @LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
   DESCRIPTION:=Kernel module for USB-to-Ethernet Pegasus convertors
   KCONFIG:=CONFIG_USB_PEGASUS
@@ -395,19 +406,17 @@ define KernelPackage/usb-hid
   TITLE:=Support for USB Human Input Devices
   DESCRIPTION:=Kernel support for USB HID devices such as keyboards and mice
   KCONFIG:=CONFIG_USB_HID
+  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
   AUTOLOAD:=$(call AutoLoad,70,usbhid)
 endef
 
-define KernelPackage/usb-hid/2.6
-  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
-endef
 $(eval $(call KernelPackage,usb-hid))
 
 define KernelPackage/usb-yealink
   $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
   TITLE:=USB Yealink VOIP phone
   DESCRIPTION:=Kernel support for Yealink VOIP phone
-  KCONFIG:=CONFIG_USB_YEALINK
+  KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
   FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
   AUTOLOAD:=$(call AutoLoad,70,yealink)
 endef