diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /include/linux/usb_ch9.h | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/linux/usb_ch9.h')
| -rw-r--r-- | include/linux/usb_ch9.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/usb_ch9.h b/include/linux/usb_ch9.h index ee21e6bf3867..a2aacfc7af2f 100644 --- a/include/linux/usb_ch9.h +++ b/include/linux/usb_ch9.h | |||
| @@ -535,9 +535,11 @@ enum usb_device_state { | |||
| 535 | */ | 535 | */ |
| 536 | USB_STATE_NOTATTACHED = 0, | 536 | USB_STATE_NOTATTACHED = 0, |
| 537 | 537 | ||
| 538 | /* the chapter 9 device states */ | 538 | /* chapter 9 and authentication (wireless) device states */ |
| 539 | USB_STATE_ATTACHED, | 539 | USB_STATE_ATTACHED, |
| 540 | USB_STATE_POWERED, | 540 | USB_STATE_POWERED, /* wired */ |
| 541 | USB_STATE_UNAUTHENTICATED, /* auth */ | ||
| 542 | USB_STATE_RECONNECTING, /* auth */ | ||
| 541 | USB_STATE_DEFAULT, /* limited function */ | 543 | USB_STATE_DEFAULT, /* limited function */ |
| 542 | USB_STATE_ADDRESS, | 544 | USB_STATE_ADDRESS, |
| 543 | USB_STATE_CONFIGURED, /* most functions */ | 545 | USB_STATE_CONFIGURED, /* most functions */ |
