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/scsi/cxgbi/libcxgbi.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/scsi/cxgbi/libcxgbi.h')
| -rw-r--r-- | drivers/scsi/cxgbi/libcxgbi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h index 0a20fd5f7102..9267844519c9 100644 --- a/drivers/scsi/cxgbi/libcxgbi.h +++ b/drivers/scsi/cxgbi/libcxgbi.h | |||
| @@ -262,9 +262,9 @@ struct cxgbi_skb_tx_cb { | |||
| 262 | enum cxgbi_skcb_flags { | 262 | enum cxgbi_skcb_flags { |
| 263 | SKCBF_TX_NEED_HDR, /* packet needs a header */ | 263 | SKCBF_TX_NEED_HDR, /* packet needs a header */ |
| 264 | SKCBF_RX_COALESCED, /* received whole pdu */ | 264 | SKCBF_RX_COALESCED, /* received whole pdu */ |
| 265 | SKCBF_RX_HDR, /* recieved pdu header */ | 265 | SKCBF_RX_HDR, /* received pdu header */ |
| 266 | SKCBF_RX_DATA, /* recieved pdu payload */ | 266 | SKCBF_RX_DATA, /* received pdu payload */ |
| 267 | SKCBF_RX_STATUS, /* recieved ddp status */ | 267 | SKCBF_RX_STATUS, /* received ddp status */ |
| 268 | SKCBF_RX_DATA_DDPD, /* pdu payload ddp'd */ | 268 | SKCBF_RX_DATA_DDPD, /* pdu payload ddp'd */ |
| 269 | SKCBF_RX_HCRC_ERR, /* header digest error */ | 269 | SKCBF_RX_HCRC_ERR, /* header digest error */ |
| 270 | SKCBF_RX_DCRC_ERR, /* data digest error */ | 270 | SKCBF_RX_DCRC_ERR, /* data digest error */ |