Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[linux-block.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index ae82d9d1112b017ff3d88d92c72e79a33a1e0ba6..83d35d993e8c91cda28eb4f6f0ff222750a4a1db 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -578,6 +578,7 @@ struct usb3_lpm_parameters {
  * @bus_mA: Current available from the bus
  * @portnum: parent port number (origin 1)
  * @level: number of USB hub ancestors
+ * @devaddr: device address, XHCI: assigned by HW, others: same as devnum
  * @can_submit: URBs may be submitted
  * @persist_enabled:  USB_PERSIST enabled for this device
  * @have_langid: whether string_langid is valid
@@ -661,6 +662,7 @@ struct usb_device {
        unsigned short bus_mA;
        u8 portnum;
        u8 level;
+       u8 devaddr;
 
        unsigned can_submit:1;
        unsigned persist_enabled:1;