From: Magliano Andrea <masterblaster@tiscali.it>
Date: Tue, 25 Jan 2011 22:45:40 +0000 (+0100)
Subject: UPROTO_BOOT_KEYBOARD is already defined in usb.h as UIPROTO_BOOT_KEYBOARD
X-Git-Tag: v2.11.0~270^2~30
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/21d2699b7b9761340739f904bdeea9198acff6be?ds=sidebyside

UPROTO_BOOT_KEYBOARD is already defined in usb.h as UIPROTO_BOOT_KEYBOARD
---

diff --git a/sys/dev/usbmisc/ukbd/ukbd.c b/sys/dev/usbmisc/ukbd/ukbd.c
index 2099921013..dbdb2f8889 100644
--- a/sys/dev/usbmisc/ukbd/ukbd.c
+++ b/sys/dev/usbmisc/ukbd/ukbd.c
@@ -90,8 +90,6 @@ SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW,
 #define DPRINTFN(n,x)
 #endif
 
-#define UPROTO_BOOT_KEYBOARD 1
-
 #define NKEYCODE 6
 
 struct ukbd_data {
@@ -1424,7 +1422,7 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags)
 	if (id
 	    && id->bInterfaceClass == UICLASS_HID
 	    && id->bInterfaceSubClass == UISUBCLASS_BOOT
-	    && id->bInterfaceProtocol == UPROTO_BOOT_KEYBOARD)
+	    && id->bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD)
 		return 0;	/* found it */
 
 	return EINVAL;