diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:03:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:05:21 +0100 |
| commit | 22a867d81707b0a2720bb5f65255265b95d30526 (patch) | |
| tree | 7ec19b155b50b13ae95244c2bfa16aea4920c4f6 /drivers/message/i2o/i2o_scsi.c | |
| parent | 5bb6b1ea67a73f0665a41726dd7138977b992c6c (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
| download | blackbird-op-linux-22a867d81707b0a2720bb5f65255265b95d30526.tar.gz blackbird-op-linux-22a867d81707b0a2720bb5f65255265b95d30526.zip | |
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/message/i2o/i2o_scsi.c')
| -rw-r--r-- | drivers/message/i2o/i2o_scsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c index ea6b2197da8a..97bdf82ec905 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/message/i2o/i2o_scsi.c @@ -506,7 +506,7 @@ static struct i2o_driver i2o_scsi_driver = { * Locks: takes the controller lock on error path only */ -static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, +static int i2o_scsi_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done) (struct scsi_cmnd *)) { struct i2o_controller *c; @@ -688,7 +688,9 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, exit: return rc; -}; +} + +static DEF_SCSI_QCMD(i2o_scsi_queuecommand) /** * i2o_scsi_abort - abort a running command |
