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/aha1740.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/aha1740.c')
-rw-r--r-- | drivers/scsi/aha1740.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c index d058f1ab82b5..1c10b796c1a2 100644 --- a/drivers/scsi/aha1740.c +++ b/drivers/scsi/aha1740.c | |||
@@ -461,7 +461,7 @@ static int aha1740_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *) | |||
461 | /* The Adaptec Spec says the card is so fast that the loops | 461 | /* The Adaptec Spec says the card is so fast that the loops |
462 | will only be executed once in the code below. Even if this | 462 | will only be executed once in the code below. Even if this |
463 | was true with the fastest processors when the spec was | 463 | was true with the fastest processors when the spec was |
464 | written, it doesn't seem to be true with todays fast | 464 | written, it doesn't seem to be true with today's fast |
465 | processors. We print a warning if the code is executed more | 465 | processors. We print a warning if the code is executed more |
466 | often than LOOPCNT_WARN. If this happens, it should be | 466 | often than LOOPCNT_WARN. If this happens, it should be |
467 | investigated. If the count reaches LOOPCNT_MAX, we assume | 467 | investigated. If the count reaches LOOPCNT_MAX, we assume |