diff options
author | thompsa <thompsa@FreeBSD.org> | 2009-02-23 18:34:56 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2009-02-23 18:34:56 +0000 |
commit | 6b0018e885dd384f1bb0b0572d672fca70457e1d (patch) | |
tree | 81dff64bd5268a4f3a9c62cbc575526b199e75fb /sys/sun4v | |
parent | 415f7bca41f88b583d3b88b644431a7ef174492c (diff) | |
download | FreeBSD-src-6b0018e885dd384f1bb0b0572d672fca70457e1d.zip FreeBSD-src-6b0018e885dd384f1bb0b0572d672fca70457e1d.tar.gz |
Change over the usb kernel options to the new stack (retaining existing
naming). The old usb stack can be compiled in my prefixing the name with 'o'.
Diffstat (limited to 'sys/sun4v')
-rw-r--r-- | sys/sun4v/conf/GENERIC | 63 |
1 files changed, 5 insertions, 58 deletions
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC index 3ff8fe3..fac7e04 100644 --- a/sys/sun4v/conf/GENERIC +++ b/sys/sun4v/conf/GENERIC @@ -180,69 +180,16 @@ device faith # IPv6-to-IPv4 relaying (translation) # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter -# 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_slcom -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) +# USB support #device uhci # UHCI PCI->USB interface #device ohci # OHCI PCI->USB interface -#device usb # USB Bus (required) +device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -#device ugen # Generic -#device uhid # "Human Interface Devices" +device uhid # "Human Interface Devices" #device ukbd # Keyboard -#device ulpt # Printer +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 |