diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:50:02 -0400 |
| commit | 7a309490da98981558a07183786201f02a6341e2 (patch) | |
| tree | 204bfd3bc344dbb02be0b1eac29b956f6722e661 /drivers/usb/host/whci/whci-hc.h | |
| parent | 9a8709d44139748fe2e0ab56d20d8c384c8b65ad (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/apic
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/host/whci/whci-hc.h')
| -rw-r--r-- | drivers/usb/host/whci/whci-hc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/whci/whci-hc.h b/drivers/usb/host/whci/whci-hc.h index 51df7e313b38..794dba0d0f0a 100644 --- a/drivers/usb/host/whci/whci-hc.h +++ b/drivers/usb/host/whci/whci-hc.h | |||
| @@ -185,6 +185,7 @@ struct whc_qhead { | |||
| 185 | #define QH_STATUS_FLOW_CTRL (1 << 15) | 185 | #define QH_STATUS_FLOW_CTRL (1 << 15) |
| 186 | #define QH_STATUS_ICUR(i) ((i) << 5) | 186 | #define QH_STATUS_ICUR(i) ((i) << 5) |
| 187 | #define QH_STATUS_TO_ICUR(s) (((s) >> 5) & 0x7) | 187 | #define QH_STATUS_TO_ICUR(s) (((s) >> 5) & 0x7) |
| 188 | #define QH_STATUS_SEQ_MASK 0x1f | ||
| 188 | 189 | ||
| 189 | /** | 190 | /** |
| 190 | * usb_pipe_to_qh_type - USB core pipe type to QH transfer type | 191 | * usb_pipe_to_qh_type - USB core pipe type to QH transfer type |