diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/scsi/aic94xx/aic94xx_reg_def.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_reg_def.h')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_reg_def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h index 40273a747d29..dd6cc8008b16 100644 --- a/drivers/scsi/aic94xx/aic94xx_reg_def.h +++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h | |||
| @@ -2134,7 +2134,7 @@ | |||
| 2134 | * The host accesses this scratch in a different manner from the | 2134 | * The host accesses this scratch in a different manner from the |
| 2135 | * link sequencer. The sequencer has to use LSEQ registers | 2135 | * link sequencer. The sequencer has to use LSEQ registers |
| 2136 | * LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat | 2136 | * LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat |
| 2137 | * mapping of the scratch memory is avaliable for software | 2137 | * mapping of the scratch memory is available for software |
| 2138 | * convenience and to prevent corruption while the sequencer is | 2138 | * convenience and to prevent corruption while the sequencer is |
| 2139 | * running. This memory is mapped onto addresses 800h - 9FFh. | 2139 | * running. This memory is mapped onto addresses 800h - 9FFh. |
| 2140 | * | 2140 | * |