diff options
| author | marcel <marcel@FreeBSD.org> | 2003-02-02 01:57:31 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2003-02-02 01:57:31 +0000 |
| commit | 1daa16a90e7df7415a91d1aca2ed548ae2c35660 (patch) | |
| tree | cc4dfdfce720300ebbff249e42cd6cea8b6fb6d2 /sys/dev/usb | |
| parent | 338e0caf91936dd317393e81241fa793943d52e1 (diff) | |
| download | FreeBSD-src-1daa16a90e7df7415a91d1aca2ed548ae2c35660.zip FreeBSD-src-1daa16a90e7df7415a91d1aca2ed548ae2c35660.tar.gz | |
Unbreak kernel builds caused by what appears to be a merge conflict.
This change has been tested.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/usbdevs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 7271061..0211662 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1074,7 +1074,6 @@ product TEAC FD05PUB 0x0000 FD-05PUB floppy /* Telex Communications products */ product TELEX MIC1 0x0001 Enhanced USB Microphone -product TREK THUMBDRIVE_8MB 0x9988 ThumbDrive_8MB /* Texas Intel products */ product TI UTUSB41 0x1446 UT-USB41 hub @@ -1085,7 +1084,7 @@ product THRUST FUSION_PAD 0xa0a3 Fusion Digital Gamepad /* Trek Technology products */ product TREK THUMBDRIVE 0x1111 ThumbDrive -product TREK THUMBDRIVE 0x9988 ThumbDrive +product TREK THUMBDRIVE_8MB 0x9988 ThumbDrive_8MB /* Ultima products */ product ULTIMA 1200UBPLUS 0x4002 1200 UB Plus scanner |
