From bd46280967061f40aa2d709b6ac3628db4fb4b94 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Date: Sun, 21 Jun 2009 23:20:39 +0200
Subject: [PATCH] --- yaml --- r: 164949 b: refs/heads/master c:
 315ad3028c8aae14891797040f855fc3291a076b h: refs/heads/master i:   164947:
 318314896f4183ef114493de44766dba0d37eba0 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/usb/audio.h | 1 -
 trunk/include/linux/usb/ch9.h   | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0c22989d6ebb..769cbc14b273 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85e08ca54c5c203cd2638f0fc8fa899a539f6254
+refs/heads/master: 315ad3028c8aae14891797040f855fc3291a076b
diff --git a/trunk/include/linux/usb/audio.h b/trunk/include/linux/usb/audio.h
index bcf4fb4f5e82..f75092aba02f 100644
--- a/trunk/include/linux/usb/audio.h
+++ b/trunk/include/linux/usb/audio.h
@@ -24,7 +24,6 @@
 #define USB_SUBCLASS_AUDIOCONTROL	0x01
 #define USB_SUBCLASS_AUDIOSTREAMING	0x02
 #define USB_SUBCLASS_MIDISTREAMING	0x03
-#define USB_SUBCLASS_VENDOR_SPEC	0xff
 
 /* A.5 Audio Class-Specific AC interface Descriptor Subtypes*/
 #define HEADER				0x01
diff --git a/trunk/include/linux/usb/ch9.h b/trunk/include/linux/usb/ch9.h
index 8f8b7411b87b..94012e649d86 100644
--- a/trunk/include/linux/usb/ch9.h
+++ b/trunk/include/linux/usb/ch9.h
@@ -258,6 +258,8 @@ struct usb_device_descriptor {
 #define USB_CLASS_APP_SPEC		0xfe
 #define USB_CLASS_VENDOR_SPEC		0xff
 
+#define USB_SUBCLASS_VENDOR_SPEC	0xff
+
 /*-------------------------------------------------------------------------*/
 
 /* USB_DT_CONFIG: Configuration descriptor information.