From 114278b089f1e2763490426376d1736cc7996720 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Mon, 31 May 1999 22:35:55 +0000
Subject: [PATCH] 1) Remove the definition of usb_cdc_generic_descriptor_t. It
 is equivalent to usb_descriptor_t

2) Rename USB_CDC_CM_CM_OVER_DATA to USB_CDC_CM_OVER_DATA
---
 sys/dev/usb/usbcdc.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index df7484a1f68..5187a4a2851 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -60,12 +60,6 @@
 #define UDESCSUB_CDC_AN		0x10	/* ATM Networking */
 
 
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
-} usb_cdc_generic_descriptor_t;
-
 typedef struct {
 	uByte		bLength;
 	uByte		bDescriptorType;
@@ -79,7 +73,7 @@ typedef struct {
 	uByte		bDescriptorSubtype;
 	uByte		bmCapabilities;
 #define USB_CDC_CM_DOES_CM		0x01
-#define USB_CDC_CM_CM_OVER_DATA		0x02
+#define USB_CDC_CM_OVER_DATA		0x02
 	uByte		bDataInterface;
 } usb_cdc_cm_descriptor_t;