diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/usb/host/xhci.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 711de253bc0f..07e263063e37 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 |