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/bnx2i/bnx2i_hwi.c | |
| 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/bnx2i/bnx2i_hwi.c')
| -rw-r--r-- | drivers/scsi/bnx2i/bnx2i_hwi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 1da34c019b8a..f0b89513faed 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
| @@ -173,7 +173,7 @@ void bnx2i_arm_cq_event_coalescing(struct bnx2i_endpoint *ep, u8 action) | |||
| 173 | 173 | ||
| 174 | /** | 174 | /** |
| 175 | * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer | 175 | * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer |
| 176 | * @conn: iscsi connection on which RQ event occured | 176 | * @conn: iscsi connection on which RQ event occurred |
| 177 | * @ptr: driver buffer to which RQ buffer contents is to | 177 | * @ptr: driver buffer to which RQ buffer contents is to |
| 178 | * be copied | 178 | * be copied |
| 179 | * @len: length of valid data inside RQ buf | 179 | * @len: length of valid data inside RQ buf |