diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/usb/host/xhci.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/usb/host/xhci.h')
| -rw-r--r-- | drivers/usb/host/xhci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 711de253bc0..07e263063e3 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
| @@ -873,7 +873,7 @@ struct xhci_transfer_event { | |||
| 873 | #define COMP_CMD_ABORT 25 | 873 | #define COMP_CMD_ABORT 25 |
| 874 | /* Stopped - transfer was terminated by a stop endpoint command */ | 874 | /* Stopped - transfer was terminated by a stop endpoint command */ |
| 875 | #define COMP_STOP 26 | 875 | #define COMP_STOP 26 |
| 876 | /* Same as COMP_EP_STOPPED, but the transfered length in the event is invalid */ | 876 | /* Same as COMP_EP_STOPPED, but the transferred length in the event is invalid */ |
| 877 | #define COMP_STOP_INVAL 27 | 877 | #define COMP_STOP_INVAL 27 |
| 878 | /* Control Abort Error - Debug Capability - control pipe aborted */ | 878 | /* Control Abort Error - Debug Capability - control pipe aborted */ |
| 879 | #define COMP_DBG_ABORT 28 | 879 | #define COMP_DBG_ABORT 28 |