diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/scsi/advansys.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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, |