diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-03-28 19:37:54 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-03-28 19:37:54 +0000 |
| commit | 8ae9b8c2b3c5707238e312f29f7fd0ac65417a68 (patch) | |
| tree | bf1bca71efa5651535bd4debbee0f0326ec7aaab /sys/arch/i386/conf | |
| parent | 85d190436bee0a39d5c12a32c419929402e28758 (diff) | |
Much cleaner sync with NetBSD. Some #if defined() magic has been sent in the
form of a diff to augustss@netbsd.org so that future syncs will be very easy.
This commit also adds support for ADMtek AN986 "Pegasus" based USB Ethernet,
CATC USB-EL1210A based USB Ethernet, and USB Printers (all untested).
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 430bcba190d..23aea71090a 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.165 2000/03/28 04:28:59 mickey Exp $ +# $OpenBSD: GENERIC,v 1.166 2000/03/28 19:37:45 aaron Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -79,10 +79,15 @@ pcmcia* at pcic? controller ? socket ? # USB Generic HID devices #uhid* at uhub? port ? configuration ? interface ? -# USB audio +# USB Printer +#ulpt* at uhub? port ? configuration ? interface ? + +# USB Audio #uaudio* at uhub? port ? configuration ? # USB Ethernet adapters +#aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters +#cue* at uhub? port ? # CATC USB-EL1201A based adapters #kue* at uhub? port ? # Kawasaki KL5KUSB101B based adapters # USB Generic driver |