added rtl8169, from #2554

[openwrt.git] / package / kernel / modules / usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index f4f790b..b97d69d 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -6,7 +6,7 @@
 #
 # $Id$
 
-USBMENU:=USB Support
+USB_MENU:=USB Support
 
 ifeq ($(KERNEL),2.4)
   USBNET_DIR:=usb/net
@@ -23,13 +23,13 @@ USBHID_DIR?=hid/usbhid
 USBINPUT_DIR?=input/misc
 
 define usbdep
-  SUBMENU:=$(USBMENU)
+  SUBMENU:=$(USB_MENU)
   DEPENDS:=kmod-usb-core $(1)
 endef
 
 
 define KernelPackage/usb-core
-  SUBMENU:=$(USBMENU)
+  SUBMENU:=$(USB_MENU)
   TITLE:=Support for USB
   DEPENDS:=@USB_SUPPORT
   KCONFIG:=CONFIG_USB
@@ -174,8 +174,8 @@ $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio
-  $(call usbdep,+kmod-soundcore)
-  TITLE:=Support for audio devices
+  $(call usbdep,+kmod-sound-core)
+  TITLE:=Support for USB audio devices
   KCONFIG:= \
        CONFIG_USB_AUDIO \
        CONFIG_SND_USB_AUDIO
@@ -403,6 +403,21 @@ endef
 $(eval $(call KernelPackage,usb-storage))
 
 
+define KernelPackage/usb-video
+  $(call usbdep,@LINUX_2_6)
+  TITLE:=Support for USB video devices
+  KCONFIG:=CONFIG_VIDEO_USBVIDEO
+  FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,usbvideo)
+endef
+
+define KernelPackage/usb-video/description
+ Kernel support for USB video devices
+endef
+
+$(eval $(call KernelPackage,usb-video))
+
+
 define KernelPackage/usb-atm
   $(call usbdep,@LINUX_2_6 +kmod-atm)
   TITLE:=Support for ATM on USB bus
@@ -418,72 +433,41 @@ endef
 $(eval $(call KernelPackage,usb-atm))
 
 
-define KernelPackage/usb-speedtouch
-  $(call usbdep,@LINUX_2_6 +kmod-atm)
-  TITLE:=Support for SpeedTouch ADSL modems
+define KernelPackage/usb-atm-speedtouch
+  $(call usbdep,@LINUX_2_6 kmod-usb-atm)
+  TITLE:=SpeedTouch USB ADSL modems support
   KCONFIG:=CONFIG_USB_SPEEDTOUCH
   FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,speedtch)
 endef
 
-define KernelPackage/usb-speedtouch/description
+define KernelPackage/usb-atm-speedtouch/description
  Kernel support for SpeedTouch USB ADSL modems
 endef
 
-$(eval $(call KernelPackage,usb-speedtouch))
+$(eval $(call KernelPackage,usb-atm-speedtouch))
 
 
-define KernelPackage/ueagle-atm
-  $(call usbdep,@LINUX_2_6 +kmod-atm)
-  TITLE:=Driver for Eagle 8051 based USB ADSL modems
+define KernelPackage/usb-atm-ueagle
+  $(call usbdep,@LINUX_2_6 kmod-usb-atm)
+  TITLE:=Eagle 8051 based USB ADSL modems support
   FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_USB_UEAGLEATM
   AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
 endef
 
-define KernelPackage/ueagle-atm/description
+define KernelPackage/usb-atm-ueagle/description
  Kernel support for Eagle 8051 based USB ADSL modems
 endef
 
-$(eval $(call KernelPackage,ueagle-atm))
-
-
-define KernelPackage/usb-pwc
-  $(call usbdep,+kmod-videodev @LINUX_2_6)
-  TITLE:=Philips WebCam driver
-  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/description
- Kernel modules for supporting Philips WebCam USB devices
-endef
-
-$(eval $(call KernelPackage,usb-pwc))
-
-
-define KernelPackage/cpia2
-  $(call usbdep,+kmod-videodev @LINUX_2_6)
-  TITLE:=CPIA2 video driver
-  KCONFIG:=CONFIG_VIDEO_CPIA2
-  FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,cpia2)
-endef
-
-define KernelPackage/cpia2/description
- Kernel modules for CPIA2 WebCam devices
-endef
-
-$(eval $(call KernelPackage,cpia2))
+$(eval $(call KernelPackage,usb-atm-ueagle))
 
 
 define KernelPackage/usb-net
   $(call usbdep,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
   KCONFIG:=CONFIG_USB_USBNET
-  AUTOLOAD:=$(call Autoload,60, usbnet)
+  AUTOLOAD:=$(call Autoload,60,usbnet)
 endef
 
 define KernelPackage/usb-net/2.4
@@ -546,6 +530,21 @@ endef
 $(eval $(call KernelPackage,usb-net-pegasus))
 
 
+define KernelPackage/usb-net-cdc-ether
+  $(call usbdep,kmod-usb-net @LINUX_2_6)
+  TITLE:=Support for cdc ethernet connections
+  KCONFIG:=CONFIG_USB_NET_CDCETHER
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,cdc_ether)
+endef
+
+define KernelPackage/usb-net-cdc-ether/description
+ Kernel support for USB CDC Ethernet devices
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-ether))
+
+
 define KernelPackage/usb-hid
   $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
   TITLE:=Support for USB Human Input Devices