Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 27575e678a7cb57f70ac79919285cadec12d9302..827cc6de5f5c5da2a5a94b982252530943cf0873 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -225,7 +225,7 @@ struct usb_interface_cache {
  * Device drivers should not attempt to activate configurations.  The choice
  * of which configuration to install is a policy decision based on such
  * considerations as available power, functionality provided, and the user's
- * desires (expressed through hotplug scripts).  However, drivers can call
+ * desires (expressed through userspace tools).  However, drivers can call
  * usb_reset_configuration() to reinitialize the current configuration and
  * all its interfaces.
  */
@@ -348,6 +348,7 @@ struct usb_device {
        char **rawdescriptors;          /* Raw descriptors for each config */
 
        unsigned short bus_mA;          /* Current available from the bus */
+       u8 portnum;                     /* Parent port number (origin 1) */
 
        int have_langid;                /* whether string_langid is valid */
        int string_langid;              /* language ID for strings */