summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authortron <tron@NetBSD.org>2006-06-06 08:53:58 +0000
committertron <tron@NetBSD.org>2006-06-06 08:53:58 +0000
commit132db79f9b7f0fa891f4a1d6fb85437e8a1d83a5 (patch)
tree529160ea50adb0d3e1c972b607a5d206dfd4157e /sys/dev/usb
parent88b1c2383e249419f92e76a8dbdcb7395a984d10 (diff)
Resolve name conflict between Sun Type 6 and Type 7 USB keyboard.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/usbdevs6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 613c1e9e57b..a9bf6482b48 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.429 2006/06/06 06:17:59 grant Exp $
+$NetBSD: usbdevs,v 1.430 2006/06/06 08:53:58 tron Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1791,8 +1791,8 @@ product SUNTAC AS64LX 0x000b SUNTAC U-Cable type A3
product SUNTAC AS144L4 0x0011 U-Cable type A4
/* Sun Microsystems products */
-product SUN KEYBOARD 0x0005 Type 6 USB keyboard
-product SUN KEYBOARD 0x00a2 Type 7 USB keyboard
+product SUN KEYBOARD_TYPE_6 0x0005 Type 6 USB keyboard
+product SUN KEYBOARD_TYPE_7 0x00a2 Type 7 USB keyboard
/* XXX The above is a North American PC style keyboard possibly */
product SUN MOUSE 0x0100 Type 6 USB mouse