diff --git a/[refs] b/[refs] index 49a0be0d739a..2da0dbb9a910 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 877260bd2618d1a6e6acf63100bd9d009b7c2856 +refs/heads/master: c02c4bb2058587d3c012ec08268fd93fdc654ae7 diff --git a/trunk/include/linux/usb_ch9.h b/trunk/include/linux/usb_ch9.h index ee21e6bf3867..a2aacfc7af2f 100644 --- a/trunk/include/linux/usb_ch9.h +++ b/trunk/include/linux/usb_ch9.h @@ -535,9 +535,11 @@ enum usb_device_state { */ USB_STATE_NOTATTACHED = 0, - /* the chapter 9 device states */ + /* chapter 9 and authentication (wireless) device states */ USB_STATE_ATTACHED, - USB_STATE_POWERED, + USB_STATE_POWERED, /* wired */ + USB_STATE_UNAUTHENTICATED, /* auth */ + USB_STATE_RECONNECTING, /* auth */ USB_STATE_DEFAULT, /* limited function */ USB_STATE_ADDRESS, USB_STATE_CONFIGURED, /* most functions */