--- GENERIC.orig	Mon Dec 22 10:35:13 2008
+++ GENERIC	Mon Dec 22 10:53:29 2008
@@ -286,42 +286,61 @@
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface (USB 2.0)
-device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
-device		ulpt		# Printer
-device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
-device		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
-device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
-device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
+# USB Support
+device		usb2_core		# USB Core (required)
+# USB Controllers
+device		usb2_controller		# USB Controller (required)
+device		usb2_controller_uhci	# UHCI PCI->USB interface
+device		usb2_controller_ohci	# OHCI PCI->USB interface
+device		usb2_controller_ehci	# EHCI PCI->USB interface (USB 2.0)
+#device		usb2_misc		# USB Misc. (required)
+#device		usb2_misc_dbp		# USB Double Bulk Pipe devices
+# USB Input
+device		usb2_input		# USB Input (required)
+device		usb2_input_hid		# "Human Interface Devices"
+device		usb2_input_kbd		# Keyboard
+device		usb2_input_ms		# Mouse
+# USB Storage
+device		usb2_storage
+device		usb2_storage_mass	# Disks/Mass storage - Requires scbus and da
+device		usb2_storage_rio	# Diamond Rio 500 MP3 player
+# USB WLAN
+device		usb2_wlan		# USB Wlan (required)
+device		usb2_wlan_rum		# Ralink Technology RT2501USB wireless NICs
+device		usb2_wlan_ral		# Ralink Technology RT2500USB wireless NICs
+device		usb2_wlan_zyd		# ZyDAS zb1211/zb1211b wireless NICs
+# USB Scanners
+device		usb2_image		# USB image (required by scanners)
+device		usb2_scanner		# Scanners
 # USB Serial devices
-device		ucom		# Generic com ttys
-device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
-device		uark		# Technologies ARK3116 based serial adapters
-device		ubsa		# Belkin F5U103 and compatible serial adapters
-device		uftdi		# For FTDI usb serial adapters
-device		uipaq		# Some WinCE based devices
-device		uplcom		# Prolific PL-2303 serial adapters
-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
-device		uvisor		# Visor and Palm devices
-device		uvscom		# USB serial support for DDI pocket's PHS
+device		usb2_serial		# USB Serial (Required)
+device		usb2_serial_lpt		# Printer
+device		usb2_serial_3g		# USB-based 3G modems (Option, Huawei, Sierra)
+device		usb2_serial_ark		# Technologies ARK3116 based serial adapters
+device		usb2_serial_bsa		# Belkin F5U103 and compatible serial adapters
+device		usb2_serial_bser
+device		usb2_serial_chcom
+device		usb2_serial_cycom
+device		usb2_serial_foma
+device		usb2_serial_ftdi	# For FTDI USB serial adapters
+device		usb2_serial_gensa	# Generic Serial Adapters
+device		usb2_serial_ipaq	# Some WinCE based devices
+device		usb2_serial_mct
+device		usb2_serial_modem	# Generic USB modems
+device		usb2_serial_moscom
+device		usb2_serial_plcom	# Prolific PL-2303 serial adapters
+#device		usb2_serial_slcom	# SI Labs CP2101/CP2102 serial adapters
+device		usb2_serial_visor	# Visor and Palm devices
+device		usb2_serial_vscom	# USB serial support for DDI pocket's PHS
 # USB Ethernet, requires miibus
-device		aue		# ADMtek USB Ethernet
-device		axe		# ASIX Electronics USB Ethernet
-device		cdce		# Generic USB over Ethernet
-device		cue		# CATC USB Ethernet
-device		kue		# Kawasaki LSI USB Ethernet
-device		rue		# RealTek RTL8150 USB Ethernet
-device		udav		# Davicom DM9601E USB
+device		usb2_ethernet		# USB Ethernet (required)
+device		usb2_ethernet_aue	# ADMtek USB Ethernet
+device		usb2_ethernet_axe	# ASIX Electronics USB Ethernet
+device		usb2_ethernet_cdce	# Generic USB over Ethernet
+device		usb2_ethernet_cue	# CATC USB Ethernet
+device		usb2_ethernet_kue	# Kawasaki LSI USB Ethernet
+device		usb2_ethernet_rue	# RealTek RTL8150 USB Ethernet
+device		usb2_ethernet_dav	# Davicom DM9601E USB
 
 # FireWire support
 device		firewire	# FireWire bus code