diff options
| author | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
| commit | 012a5299a29672039f42944a37984558393ef769 (patch) | |
| tree | de0815c67cf4156c32c8b552cd7448387cc391b0 /drivers/usb/host/ehci.h | |
| parent | da34d4248bd2013ee64ce51e63ec0ebd1f32b46c (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/usb/host/ehci.h')
| -rw-r--r-- | drivers/usb/host/ehci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 90ad3395bb21..2bfff30f4704 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
| @@ -354,7 +354,9 @@ struct ehci_qh { | |||
| 354 | unsigned short period; /* polling interval */ | 354 | unsigned short period; /* polling interval */ |
| 355 | unsigned short start; /* where polling starts */ | 355 | unsigned short start; /* where polling starts */ |
| 356 | #define NO_FRAME ((unsigned short)~0) /* pick new start */ | 356 | #define NO_FRAME ((unsigned short)~0) /* pick new start */ |
| 357 | |||
| 357 | struct usb_device *dev; /* access to TT */ | 358 | struct usb_device *dev; /* access to TT */ |
| 359 | unsigned clearing_tt:1; /* Clear-TT-Buf in progress */ | ||
| 358 | } __attribute__ ((aligned (32))); | 360 | } __attribute__ ((aligned (32))); |
| 359 | 361 | ||
| 360 | /*-------------------------------------------------------------------------*/ | 362 | /*-------------------------------------------------------------------------*/ |