From 1daa16a90e7df7415a91d1aca2ed548ae2c35660 Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Sun, 2 Feb 2003 01:57:31 +0000
Subject: Unbreak kernel builds caused by what appears to be a merge conflict.
 This change has been tested.

---
 sys/dev/usb/usbdevs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sys')

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
-- 
cgit v1.1