aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index c500d6b5a16d..748d04385256 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -231,7 +231,7 @@ struct usb_interface_cache {
231struct usb_host_config { 231struct usb_host_config {
232 struct usb_config_descriptor desc; 232 struct usb_config_descriptor desc;
233 233
234 char *string; 234 char *string; /* iConfiguration string, if present */
235 /* the interfaces associated with this configuration, 235 /* the interfaces associated with this configuration,
236 * stored in no particular order */ 236 * stored in no particular order */
237 struct usb_interface *interface[USB_MAXINTERFACES]; 237 struct usb_interface *interface[USB_MAXINTERFACES];
@@ -351,9 +351,11 @@ struct usb_device {
351 int have_langid; /* whether string_langid is valid */ 351 int have_langid; /* whether string_langid is valid */
352 int string_langid; /* language ID for strings */ 352 int string_langid; /* language ID for strings */
353 353
354 char *product; 354 /* static strings from the device */
355 char *manufacturer; 355 char *product; /* iProduct string, if present */
356 char *serial; /* static strings from the device */ 356 char *manufacturer; /* iManufacturer string, if present */
357 char *serial; /* iSerialNumber string, if present */
358
357 struct list_head filelist; 359 struct list_head filelist;
358 struct class_device *class_dev; 360 struct class_device *class_dev;
359 struct dentry *usbfs_dentry; /* usbfs dentry entry for the device */ 361 struct dentry *usbfs_dentry; /* usbfs dentry entry for the device */