diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/scsi/advansys.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/scsi/advansys.c')
| -rw-r--r-- | drivers/scsi/advansys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 081c6de92bc5..bfd618a69499 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
| @@ -4544,7 +4544,7 @@ AscMemWordCopyPtrToLram(PortAddr iop_base, ushort s_addr, | |||
| 4544 | * Copy 4 bytes to LRAM. | 4544 | * Copy 4 bytes to LRAM. |
| 4545 | * | 4545 | * |
| 4546 | * The source data is assumed to be in little-endian order in memory | 4546 | * The source data is assumed to be in little-endian order in memory |
| 4547 | * and is maintained in little-endian order when writen to LRAM. | 4547 | * and is maintained in little-endian order when written to LRAM. |
| 4548 | */ | 4548 | */ |
| 4549 | static void | 4549 | static void |
| 4550 | AscMemDWordCopyPtrToLram(PortAddr iop_base, | 4550 | AscMemDWordCopyPtrToLram(PortAddr iop_base, |