This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / host / uhci-hcd.h

diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index e8fc0d6..785c0c2 100644 (file)
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -324,7 +324,7 @@ enum uhci_state {
  * a subset of what the full implementation needs.
  */
 struct uhci_hcd {
-       struct usb_hcd hcd;             /* must come first! */
+       struct usb_hcd hcd;
 
 #ifdef CONFIG_PROC_FS
        /* procfs */
@@ -352,12 +352,6 @@ struct uhci_hcd {
        int resume_detect;                      /* Need a Global Resume */
        unsigned int saved_framenumber;         /* Save during PM suspend */
 
-       /* Support for port suspend/resume */
-       unsigned long port_c_suspend;           /* Bit-arrays of ports */
-       unsigned long suspended_ports;
-       unsigned long resuming_ports;
-       unsigned long resume_timeout;           /* Time to stop signalling */
-
        /* Main list of URB's currently controlled by this HC */
        struct list_head urb_list;              /* P: uhci->schedule_lock */
 
@@ -391,12 +385,12 @@ struct urb_priv {
        struct uhci_qh *qh;             /* QH for this URB */
        struct list_head td_list;       /* P: urb->lock */
 
-       unsigned fsbr : 1;              /* URB turned on FSBR */
-       unsigned fsbr_timeout : 1;      /* URB timed out on FSBR */
-       unsigned queued : 1;            /* QH was queued (not linked in) */
-       unsigned short_control_packet : 1;      /* If we get a short packet during */
-                                               /*  a control transfer, retrigger */
-                                               /*  the status phase */
+       int fsbr : 1;                   /* URB turned on FSBR */
+       int fsbr_timeout : 1;           /* URB timed out on FSBR */
+       int queued : 1;                 /* QH was queued (not linked in) */
+       int short_control_packet : 1;   /* If we get a short packet during */
+                                       /*  a control transfer, retrigger */
+                                       /*  the status phase */
 
        unsigned long inserttime;       /* In jiffies */
        unsigned long fsbrtime;         /* In jiffies */