From c18faa8ac7922bd573b259c15c4f5ccb24bc31db Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 19 Jul 2007 10:21:37 -0700 Subject: [PATCH] --- yaml --- r: 63194 b: refs/heads/master c: 3f423787ec87bbe601cb3242d6065616098c6cfb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/usb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a0baecbc3675..a659833521a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb745354f3b1e79e5c24de0de680b31b835bbfaf +refs/heads/master: 3f423787ec87bbe601cb3242d6065616098c6cfb diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index 7a60946df3b6..4f33a58fa9d1 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -94,6 +94,7 @@ enum usb_interface_condition { * endpoint configurations. They will be in no particular order. * @num_altsetting: number of altsettings defined. * @cur_altsetting: the current altsetting. + * @intf_assoc: interface association descriptor * @driver: the USB driver that is bound to this interface. * @minor: the minor number assigned to this interface, if this * interface is bound to a driver that uses the USB major number. @@ -213,6 +214,7 @@ struct usb_interface_cache { * @desc: the device's configuration descriptor. * @string: pointer to the cached version of the iConfiguration string, if * present for this configuration. + * @intf_assoc: list of any interface association descriptors in this config * @interface: array of pointers to usb_interface structures, one for each * interface in the configuration. The number of interfaces is stored * in desc.bNumInterfaces. These pointers are valid only while the