summaryrefslogtreecommitdiff
path: root/include/linux/usb
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@skynet.be>2009-06-22 01:20:39 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-23 17:46:19 +0400
commit315ad3028c8aae14891797040f855fc3291a076b (patch)
treea11071a499c838dd34b39ff8431ca4d44269251e /include/linux/usb
parent85e08ca54c5c203cd2638f0fc8fa899a539f6254 (diff)
downloadlinux-315ad3028c8aae14891797040f855fc3291a076b.tar.xz
USB: Move vendor subclass definition from usb/audio.h to usb/ch9.h
USB_SUBCLASS_VENDOR_SPEC is common to several USB classes and as such belongs to usb/ch9.h. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb')
-rw-r--r--include/linux/usb/audio.h1
-rw-r--r--include/linux/usb/ch9.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index bcf4fb4f5e82..f75092aba02f 100644
--- a/include/linux/usb/audio.h
+++ b/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/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 8f8b7411b87b..94012e649d86 100644
--- a/include/linux/usb/ch9.h
+++ b/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.