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/scsi/qla2xxx/qla_nx.c | |
| 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/scsi/qla2xxx/qla_nx.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 76ec876e6b21..455fe134d31d 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
| @@ -2598,7 +2598,7 @@ qla82xx_calc_dsd_lists(uint16_t dsds) | |||
| 2598 | * qla82xx_start_scsi() - Send a SCSI command to the ISP | 2598 | * qla82xx_start_scsi() - Send a SCSI command to the ISP |
| 2599 | * @sp: command to send to the ISP | 2599 | * @sp: command to send to the ISP |
| 2600 | * | 2600 | * |
| 2601 | * Returns non-zero if a failure occured, else zero. | 2601 | * Returns non-zero if a failure occurred, else zero. |
| 2602 | */ | 2602 | */ |
| 2603 | int | 2603 | int |
| 2604 | qla82xx_start_scsi(srb_t *sp) | 2604 | qla82xx_start_scsi(srb_t *sp) |