aboutsummaryrefslogtreecommitdiff
path: root/sys/sparc64
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-02-15 22:33:44 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-02-15 22:33:44 +0000
commite4edc14efd64226cdfb3788af9c43c5590f848b4 (patch)
tree0fc05ee299d01b5e20c3392253762f35ef598399 /sys/sparc64
parent7ca4fa83ec126674802c768b52d9c5ec32fef483 (diff)
downloadsrc-e4edc14efd64226cdfb3788af9c43c5590f848b4.tar.gz
src-e4edc14efd64226cdfb3788af9c43c5590f848b4.zip
Switch over GENERIC kernels to USB2 by default.
Tested by: make universe
Notes
Notes: svn path=/head/; revision=188660
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/conf/GENERIC61
1 files changed, 56 insertions, 5 deletions
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 5b9f43373e78..124f98bff9bc 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -219,17 +219,68 @@ device firmware # firmware assist module
# Note that 'bpf' is required for DHCP.
device bpf # Berkeley packet filter
-# USB support
+# USB core support
+device usb2_core
+# USB controller support
+device usb2_controller
+#device usb2_controller_ehci
+device usb2_controller_ohci
+#device usb2_controller_uhci
+# USB mass storage support
+#device usb2_storage
+#device usb2_storage_mass
+# USB ethernet support, requires miibus
+#device usb2_ethernet
+#device usb2_ethernet_aue
+#device usb2_ethernet_axe
+#device usb2_ethernet_cdce
+#device usb2_ethernet_cue
+#device usb2_ethernet_kue
+#device usb2_ethernet_rue
+#device usb2_ethernet_dav
+# USB serial device support
+#device usb2_serial
+#device usb2_serial_ark
+#device usb2_serial_bsa
+#device usb2_serial_bser
+#device usb2_serial_chcom
+#device usb2_serial_cycom
+#device usb2_serial_foma
+#device usb2_serial_ftdi
+#device usb2_serial_gensa
+#device usb2_serial_ipaq
+#device usb2_serial_lpt
+#device usb2_serial_mct
+#device usb2_serial_modem
+#device usb2_serial_moscom
+#device usb2_serial_plcom
+#device usb2_serial_visor
+#device usb2_serial_vscom
+# USB bluetooth support
+#device usb2_bluetooth
+#device usb2_bluetooth_ng
+# USB input device support
+device usb2_input
+device usb2_input_hid
+device usb2_input_kbd
+device usb2_input_ms
+# USB sound and MIDI device support
+#device usb2_sound
+# USB scanner support
+#device usb2_image
+#device usb2_scanner
+
+# USB support (deprecated)
#device uhci # UHCI PCI->USB interface
-device ohci # OHCI PCI->USB interface
-device usb # USB Bus (required)
+#device ohci # OHCI PCI->USB interface
+#device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices
#device ugen # Generic
#device uhid # "Human Interface Devices"
-device ukbd # Keyboard
+#device ukbd # Keyboard
#device ulpt # Printer
#device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
+#device ums # Mouse
#device urio # Diamond Rio 500 MP3 player
#device uscanner # Scanners
# USB Ethernet, requires mii