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/aic7xxx/aic7xxx.h | |
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/aic7xxx/aic7xxx.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h index 17444bc18bca..f695774645c1 100644 --- a/drivers/scsi/aic7xxx/aic7xxx.h +++ b/drivers/scsi/aic7xxx/aic7xxx.h | |||
@@ -440,7 +440,7 @@ struct hardware_scb { | |||
440 | * o A residual has occurred if SG_FULL_RESID is set in sgptr, | 440 | * o A residual has occurred if SG_FULL_RESID is set in sgptr, |
441 | * or residual_sgptr does not have SG_LIST_NULL set. | 441 | * or residual_sgptr does not have SG_LIST_NULL set. |
442 | * | 442 | * |
443 | * o We are transfering the last segment if residual_datacnt has | 443 | * o We are transferring the last segment if residual_datacnt has |
444 | * the SG_LAST_SEG flag set. | 444 | * the SG_LAST_SEG flag set. |
445 | * | 445 | * |
446 | * Host: | 446 | * Host: |
@@ -494,7 +494,7 @@ struct hardware_scb { | |||
494 | */ | 494 | */ |
495 | 495 | ||
496 | /* | 496 | /* |
497 | * Definition of a scatter/gather element as transfered to the controller. | 497 | * Definition of a scatter/gather element as transferred to the controller. |
498 | * The aic7xxx chips only support a 24bit length. We use the top byte of | 498 | * The aic7xxx chips only support a 24bit length. We use the top byte of |
499 | * the length to store additional address bits and a flag to indicate | 499 | * the length to store additional address bits and a flag to indicate |
500 | * that a given segment terminates the transfer. This gives us an | 500 | * that a given segment terminates the transfer. This gives us an |