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/ia64 | |
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/ia64')
-rw-r--r-- | sys/ia64/conf/GENERIC | 81 |
1 files changed, 14 insertions, 67 deletions
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 88c6f0f..ab471f7 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -70,8 +70,7 @@ device firewire # FireWire bus code device miibus # MII bus support (Ethernet) device pci # PCI bus support device scbus # SCSI bus (required for SCSI) -#device usb # USB Bus (required for USB) -device usb2_core # USB Bus (required for USB) +device usb # USB Bus (required for USB) # ATA and ATAPI devices device ata # ATA controller @@ -108,57 +107,15 @@ device amr # AMI MegaRAID device ida # Compaq Smart RAID device mlx # Mylex DAC960 family -# 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 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 host controllers and peripherals -#device ehci # EHCI host controller -#device ohci # OHCI PCI->USB interface -#device ugen # Generic device -#device uhci # UHCI PCI->USB interface -#device uhid # Human Interface Devices -#device ukbd # Keyboard -#device ulpt # Printer -#device umass # Disks/Mass storage (need scbus & da) -#device ums # Mouse +device ehci # EHCI host controller +device ohci # OHCI PCI->USB interface +device uhci # UHCI PCI->USB interface +device uhid # Human Interface Devices +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage (need scbus & da) +device ums # Mouse # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') @@ -178,21 +135,11 @@ device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 device xl # 3Com 3c90x ("Boomerang", "Cyclone") -# 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 Ethernet (deprecated) -#device aue # ADMtek USB Ethernet -#device cdce # Generic USB over Ethernet -#device cue # CATC USB Ethernet -#device kue # Kawasaki LSI USB Ethernet +# USB Ethernet +device aue # ADMtek USB Ethernet +device cdce # Generic USB over Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device sbp # SCSI over FireWire (need scbus & da) |