X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5c747a29e7ebba677a34ceb5bd63fef483b318d6..33a8f82a35eaa0c85a74b5db8a464f540a25378f:/package/kernel/modules/usb.mk?ds=sidebyside

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index adff3fa53..0f95ad8b2 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -80,17 +80,17 @@ $(eval $(call KernelPackage,usb-uhci))
 
 define KernelPackage/usb-uhci-iv
   $(call usbdep,@LINUX_2_4)
-  TITLE:=Support for Intel/VIA UHCI controllers 
+  TITLE:=Support for Intel/VIA UHCI controllers
   KCONFIG:=CONFIG_USB_UHCI
   FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,usb-uhci) 
-endef 
+  AUTOLOAD:=$(call AutoLoad,50,usb-uhci)
+endef
 
 define KernelPackage/usb-uhci-iv/description
  Kernel support for Intel/VIA USB UHCI controllers
 endef
 
-$(eval $(call KernelPackage,usb-uhci-iv)) 
+$(eval $(call KernelPackage,usb-uhci-iv))
 
 
 define KernelPackage/usb-ohci
@@ -140,7 +140,7 @@ define KernelPackage/usb2
   TITLE:=Support for USB2 controllers
   KCONFIG:=CONFIG_USB_EHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
+  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd)
 endef
 
 define KernelPackage/usb2/description
@@ -242,21 +242,21 @@ $(eval $(call KernelPackage,usb-serial))
 
 define KernelPackage/usb-serial-airprime
   $(call usbdep,kmod-usb-serial @LINUX_2_6)
-  TITLE:=Support for Airprime (EVDO) 
+  TITLE:=Support for Airprime (EVDO)
   KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
   FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,airprime)
 endef
 
 define KernelPackage/usb-serial-airprime/description
- Kernel support for Airprime (EVDO) 
+ Kernel support for Airprime (EVDO)
 endef
 
 $(eval $(call KernelPackage,usb-serial-airprime))
 
 
 define KernelPackage/usb-serial-belkin
-  $(call usbdep,kmod-usb-serial @LINUX_2_6&&@!LINUX_2_6_23)
+  $(call usbdep,kmod-usb-serial)
   TITLE:=Support for Belkin devices
   KCONFIG:=CONFIG_USB_SERIAL_BELKIN
   FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
@@ -271,7 +271,7 @@ $(eval $(call KernelPackage,usb-serial-belkin))
 
 
 define KernelPackage/usb-serial-ch341
-  $(call usbdep,kmod-usb-serial)
+  $(call usbdep,kmod-usb-serial @LINUX_2_6&&@!LINUX_2_6_23)
   TITLE:=Support for CH341 devices
   KCONFIG:=CONFIG_USB_SERIAL_CH341
   FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX)
@@ -575,10 +575,11 @@ $(eval $(call KernelPackage,usb-net-asix))
 
 
 define KernelPackage/usb-net-hso
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+  $(call usbdep,kmod-usb-net @LINUX_2_6_26)
   TITLE:=Kernel module for Option USB High Speed Mobile Devices
   KCONFIG:= \
 	CONFIG_RFKILL \
+	CONFIG_RFKILL_INPUT \
 	CONFIG_USB_HSO
   FILES:= \
 	$(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \
@@ -681,3 +682,16 @@ endef
 
 $(eval $(call KernelPackage,usb-test))
 
+define KernelPackage/usb-phidget
+  $(call usbdep,@LINUX_2_6)
+  TITLE:=USB Phidget Driver
+  KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO
+  FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko
+endef
+
+define KernelPackage/usb-phidget/description
+ Kernel support for USB Phidget devices.
+endef
+
+$(eval $(call KernelPackage,usb-phidget))
+