Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6-omap-h63xx.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 5634a2d91ec03a41fb0842efe3ee9ac09c8fa291..0cd73edeef139f3d0a4d2bd8d1b43151d8b51eb4 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -362,6 +362,7 @@ struct usb_device {
        u8 portnum;                     /* Parent port number (origin 1) */
        u8 level;                       /* Number of USB hub ancestors */
 
+       unsigned discon_suspended:1;    /* Disconnected while suspended */
        unsigned have_langid:1;         /* whether string_langid is valid */
        int string_langid;              /* language ID for strings */