svn commit: r208217 - stable/8/sys/dev/usb/input

[Andrew Thompson]

Author: thompsa
Date: Mon May 17 23:43:07 2010
New Revision: 208217
URL: http://svn.freebsd.org/changeset/base/208217

Log:
  MFC r206638
  
   Use the UIPROTO_BOOT_KEYBOARD #define from usb.h rather than a local
   (almost identically named) local #define.

Modified:
  stable/8/sys/dev/usb/input/ukbd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/usb/input/ukbd.c
==============================================================================
--- stable/8/sys/dev/usb/input/ukbd.c	Mon May 17 23:42:29 2010	(r208216)
+++ stable/8/sys/dev/usb/input/ukbd.c	Mon May 17 23:43:07 2010	(r208217)
@@ -109,8 +109,6 @@ TUNABLE_INT("hw.usb.ukbd.debug", &ukbd_d
 TUNABLE_INT("hw.usb.ukbd.no_leds", &ukbd_no_leds);
 #endif
 
-#define	UPROTO_BOOT_KEYBOARD 1
-
 #define	UKBD_EMULATE_ATSCANCODE	       1
 #define	UKBD_DRIVER_NAME          "ukbd"
 #define	UKBD_NMOD                     8	/* units */
@@ -777,7 +775,7 @@ ukbd_probe(device_t dev)
 		return (ENXIO);
 
 	if ((uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
-	    (uaa->info.bInterfaceProtocol == UPROTO_BOOT_KEYBOARD)) {
+	    (uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD)) {
 		if (usb_test_quirk(uaa, UQ_KBD_IGNORE))
 			return (ENXIO);
 		else