port the usb modules over to the new system

SVN-Revision: 5197

4 files changed, 240 insertions, 237 deletions

diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk
index 61ecbdb00b..007f6600cc 100644
--- a/include/modules-2.4.mk
+++ b/include/modules-2.4.mk
@@ -108,66 +108,6 @@ $(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\
 ,CONFIG_PCMCIA_SERIAL_CS,kmod-pcmcia-core,51,serial_cs))
 
 
-# USB
-
-$(eval $(call KMOD_template,USB,usb-core,\
-	$(MODULES_DIR)/kernel/drivers/usb/usbcore.o \
-,CONFIG_USB,,50,usbcore))
-
-$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
-,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci))
-
-$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
-,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
-
-$(eval $(call KMOD_template,USB2,usb2,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
-,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
-
-$(eval $(call KMOD_template,USB_ACM,usb-acm,\
-	$(MODULES_DIR)/kernel/drivers/usb/acm.o \
-,CONFIG_USB_ACM))
-
-$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
-	$(MODULES_DIR)/kernel/drivers/usb/audio.o \
-,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
-
-$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
-	$(MODULES_DIR)/kernel/drivers/usb/printer.o \
-,CONFIG_USB_PRINTER,kmod-usb-core,60,printer))
-
-$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.o \
-,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial))
-
-$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.o \
-,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa))
-
-$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \
-,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio))
-
-$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \
-,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232))
-
-$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.o \
-,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303))
-
-$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/visor.o \
-,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor))
-
-$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
-	$(MODULES_DIR)/kernel/drivers/scsi/*.o \
-	$(MODULES_DIR)/kernel/drivers/usb/storage/*.o \
-,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
-
-
 # Misc. devices
 
 $(eval $(call KMOD_template,AX25,ax25,\
diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk
index 8d67164c46..a44800d594 100644
--- a/include/modules-2.6.mk
+++ b/include/modules-2.6.mk
@@ -138,74 +138,6 @@ $(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\
 ,CONFIG_SERIAL_8250_CS))
 
 
-# USB
-
-$(eval $(call KMOD_template,USB,usb-core,\
-	$(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \
-,CONFIG_USB,,50,usbcore))
-
-$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \
-,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd))
-
-$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko \
-,CONFIG_USB_UHCI_HCD,kmod-usb-core,60,uhci-hcd))
-
-$(eval $(call KMOD_template,USB2,usb2,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \
-,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
-
-$(eval $(call KMOD_template,USB_ACM,usb-acm,\
-	$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
-,CONFIG_USB_ACM))
-
-$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
-	$(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \
-,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
-
-$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
-	$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
-,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp))
-
-$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.ko \
-,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial))
-
-$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.ko \
-,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa))
-
-$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.ko \
-,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio))
-
-$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.ko \
-,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232))
-
-$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.ko \
-,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303))
-
-$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\
-	$(MODULES_DIR)/kernel/drivers/usb/serial/visor.ko \
-,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor))
-
-$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
-	$(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.ko \
-	$(MODULES_DIR)/kernel/drivers/scsi/sd_mod.ko \
-	$(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.ko \
-,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
-
-$(eval $(call KMOD_template,USB_ATM,usb-atm,\
-        $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.ko \
-	,CONFIG_USB_ATM,kmod-usb-atm,50,usbatm))
-
-$(eval $(call KMOD_template,USB_ATM_SPEEDTOUCH,usb-atm-speedtouch,\
-        $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.ko \
-	,CONFIG_USB_SPEEDTOUCH,kmod-usb-atm-speedtouch,50,speedtch))
-
 # Misc. devices
 
 $(eval $(call KMOD_template,AX25,ax25,\
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
new file mode 100644
index 0000000000..af41339777
--- /dev/null
+++ b/package/kernel/modules/usb.mk
@@ -0,0 +1,239 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+USBMENU:=USB Support
+
+define KernelPackage/usb-core
+  TITLE:=Support for USB
+  DESCRIPTION:=Kernel support for USB
+  DEPENDS:=@USB_SUPPORT
+  KCONFIG:=$(CONFIG_USB)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(USBMENU)
+  AUTOLOAD:=$(call AutoLoad,20,usb-core)
+endef
+$(eval $(call KernelPackage,usb-core))
+
+
+define KernelPackage/usb-uhci
+  TITLE:=Support for UHCI controllers
+  DESCRIPTION:=Kernel support for USB UHCI controllers
+  DEPENDS:=kmod-usb-core
+  PROVIDES:=usb-controller
+  SUBMENU:=$(USBMENU)
+endef
+
+define KernelPackage/usb-uhci/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o
+  KCONFIG:=$(CONFIG_USB_UHCI_ALT)
+  AUTOLOAD:=$(call AutoLoad,50,uhci)
+endef
+
+define KernelPackage/usb-uhci/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko
+  KCONFIG:=$(CONFIG_USB_UHCI_HCD)
+  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
+endef
+$(eval $(call KernelPackage,usb-uhci))
+
+
+define KernelPackage/usb-ohci
+  TITLE:=Support for OHCI controllers
+  DESCRIPTION:=Kernel support for USB OHCI controllers
+  DEPENDS:=kmod-usb-core
+  PROVIDES:=usb-controller
+  SUBMENU:=$(USBMENU)
+endef
+
+define KernelPackage/usb-ohci/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o
+  KCONFIG:=$(CONFIG_USB_OHCI)
+  AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
+endef
+
+define KernelPackage/usb-ohci/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko
+  KCONFIG:=$(CONFIG_USB_OHCI_HCD)
+  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
+endef
+$(eval $(call KernelPackage,usb-ohci))
+
+
+define KernelPackage/usb2
+  TITLE:=Support for USB2 controllers
+  DESCRIPTION:=Kernel support for USB2 (EHCI) controllers
+  DEPENDS:=kmod-usb-core
+  PROVIDES:=usb-controller
+  KCONFIG:=$(CONFIG_USB)
+  SUBMENU:=$(USBMENU)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_USB_EHCI_HCD)
+  AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
+endef
+$(eval $(call KernelPackage,usb2))
+
+
+define usbdep
+  SUBMENU:=$(USBMENU)
+  DEPENDS:=kmod-usb-core usb-controller $(1)
+endef
+
+
+define KernelPackage/usb-acm
+  $(call usbdep,)
+  TITLE:=Support for modems/isdn controllers
+  DESCRIPTION:=Kernel support for USB ACM devices (modems/isdn controllers)
+  KCONFIG:=$(CONFIG_USB_ACM)
+endef
+
+define KernelPackage/usb-acm/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/acm.o
+  AUTOLOAD:=$(call AutoLoad,60,acm)
+endef
+
+define KernelPackage/usb-acm/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko
+  AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
+endef
+$(eval $(call KernelPackage,usb-acm))
+
+
+define KernelPackage/usb-audio
+  $(call usbdep,+kmod-soundcore)
+  TITLE:=Support for audio devices
+  DESCRIPTION:=Kernel support for USB audio devices
+  KCONFIG:=$(CONFIG_USB_AUDIO)
+  AUTOLOAD:=$(call AutoLoad,60,audio)
+endef
+
+define KernelPackage/usb-audio/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
+endef
+
+define KernelPackage/usb-audio/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/audio.ko
+endef
+$(eval $(call KernelPackage,usb-audio))
+
+
+define KernelPackage/usb-printer
+  $(call usbdep,)
+  TITLE:=Support for printers
+  DESCRIPTION:=Kernel support for USB printers
+  KCONFIG:=$(CONFIG_USB_PRINTER)
+endef
+
+define KernelPackage/usb-printer/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/printer.o
+  AUTOLOAD:=$(call AutoLoad,60,printer)
+endef
+
+define KernelPackage/usb-printer/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko
+  AUTOLOAD:=$(call AutoLoad,60,usblp)
+endef
+$(eval $(call KernelPackage,usb-printer))
+
+
+define KernelPackage/usb-serial
+  $(call usbdep,)
+  TITLE:=Support for USB-to-Serial converters
+  DESCRIPTION:=Kernel support for USB-to-Serial converters
+  KCONFIG:=$(CONFIG_USB_SERIAL)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,usbserial)
+endef
+$(eval $(call KernelPackage,usb-serial))
+
+
+define KernelPackage/usb-serial-belkin
+  TITLE:=Support for Belkin devices
+  DESCRIPTION:=Kernel support for Belkin USB-to-Serial converters
+  DEPENDS:=kmod-usb-serial
+  SUBMENU:=$(USBMENU)
+  KCONFIG:=$(CONFIG_USB_SERIAL_BELKIN)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,belkin_sa)
+endef
+$(eval $(call KernelPackage,usb-serial-belkin))
+
+
+define KernelPackage/usb-serial-ftdi
+  TITLE:=Support for FTDI devices
+  DESCRIPTION:=Kernel support for FTDI USB-to-Serial converters
+  DEPENDS:=kmod-usb-serial
+  SUBMENU:=$(USBMENU)
+  KCONFIG:=$(CONFIG_USB_SERIAL_FTDI_SIO)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)
+endef
+$(eval $(call KernelPackage,usb-serial-ftdi))
+
+
+define KernelPackage/usb-serial-mct
+  TITLE:=Support for Magic Control Tech. devices
+  DESCRIPTION:=Kernel support for Magic Control Technology USB-to-Serial converters
+  DEPENDS:=kmod-usb-serial
+  SUBMENU:=$(USBMENU)
+  KCONFIG:=$(CONFIG_USB_SERIAL_MCT_U232)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,mct_u232)
+endef
+$(eval $(call KernelPackage,usb-serial-mct))
+
+define KernelPackage/usb-serial-pl2303
+  TITLE:=Support for Prolific PL2303 devices
+  DESCRIPTION:=Kernel support for Prolific PL2303 USB-to-Serial converters
+  DEPENDS:=kmod-usb-serial
+  SUBMENU:=$(USBMENU)
+  KCONFIG:=$(CONFIG_USB_SERIAL_PL2303)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,pl2303)
+endef
+$(eval $(call KernelPackage,usb-serial-pl2303))
+
+
+define KernelPackage/usb-serial-visor
+  TITLE:=Support for Handspring Visor devices
+  DESCRIPTION:=Kernel support for Handspring Visor PDAs
+  DEPENDS:=kmod-usb-serial
+  SUBMENU:=$(USBMENU)
+  KCONFIG:=$(CONFIG_USB_SERIAL_VISOR)
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,visor)
+endef
+$(eval $(call KernelPackage,usb-serial-visor))
+
+
+define KernelPackage/usb-storage
+  $(call usbdep,)
+  TITLE:=USB Storage support
+  DESCRIPTION:=Kernel support for USB Mass Storage devices
+  KCONFIG:=$(CONFIG_USB_STORAGE)
+  FILES:= \
+	$(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
+endef
+$(eval $(call KernelPackage,usb-storage))
+
+
+
+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:= \
+	$(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
+endef
+$(eval $(call KernelPackage,usb-speedtouch))
+  
diff --git a/target/linux/Config.in b/target/linux/Config.in
index d67548e22c..21d7d58d42 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -80,7 +80,7 @@ menu "Multimedia devices support"
 config PACKAGE_KMOD_PWC
 	prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
 	tristate
-	depends PACKAGE_KMOD_USB
+	depends PACKAGE_kmod-usb-core
 	default m
 
 config PACKAGE_KMOD_SOUNDCORE
@@ -270,114 +270,6 @@ config PACKAGE_KMOD_PCMCIA_SERIAL
 
 endmenu
 
-menu "USB support"
-	depends USB_SUPPORT
-
-config PACKAGE_KMOD_USB
-	prompt "kmod-usb-core..................... USB support"
-	tristate
-	default m
-
-config PACKAGE_KMOD_USB_UHCI 
-	prompt   "kmod-usb-uhci................... Support for UHCI controllers"
-	tristate
-	default n if LINUX_2_6_AU1000
-	depends PACKAGE_KMOD_USB
-	select PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_OHCI
-	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB
-	select PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB2
-	prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
-	tristate
-	default n if LINUX_2_6_AU1000
-	depends PACKAGE_KMOD_USB
-	select PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_CONTROLLER
-	tristate
-	depends on PACKAGE_KMOD_USB_UHCI || PACKAGE_KMOD_USB_OHCI || PACKAGE_KMOD_USB2
-	default n
-
-config PACKAGE_KMOD_USB_ACM
-	prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_AUDIO
-	prompt "kmod-usb-audio.................... Support for USB soundcards"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_CONTROLLER
-	select PACKAGE_KMOD_SOUNDCORE
-
-config PACKAGE_KMOD_USB_PRINTER
-	prompt "kmod-usb-printer.................. Support for USB printers"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_SERIAL
-	prompt "kmod-usb-serial................... Support for USB-to-serial converters"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_SERIAL_BELKIN
-	prompt   "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_SERIAL
-
-config PACKAGE_KMOD_USB_SERIAL_FTDI
-	prompt   "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converterr"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_SERIAL
-
-config PACKAGE_KMOD_USB_SERIAL_MCT_U232
-	prompt   "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_SERIAL
-
-config PACKAGE_KMOD_USB_SERIAL_PL2303
-	prompt   "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_SERIAL
-
-config PACKAGE_KMOD_USB_SERIAL_VISOR
-	prompt   "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_SERIAL
-
-config PACKAGE_KMOD_USB_STORAGE
-	prompt "kmod-usb-storage.................. Support for USB storage devices"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_ATM
-        prompt "kmod-usb-atm...................... Support for USB ATM devices"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_CONTROLLER
-
-config PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
-        prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
-	tristate
-	default m
-	depends PACKAGE_KMOD_USB_ATM
-
-endmenu
 
 menu "Misc. devices support"