diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /drivers/scsi/aic7xxx/aic7xxx.reg | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx.reg')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx.reg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg index 810ec700d9fc..e196d83b93c7 100644 --- a/drivers/scsi/aic7xxx/aic7xxx.reg +++ b/drivers/scsi/aic7xxx/aic7xxx.reg | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | * | 39 | * |
| 40 | * $FreeBSD$ | 40 | * $FreeBSD$ |
| 41 | */ | 41 | */ |
| 42 | VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $" | 42 | VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $" |
| 43 | 43 | ||
| 44 | /* | 44 | /* |
| 45 | * This file is processed by the aic7xxx_asm utility for use in assembling | 45 | * This file is processed by the aic7xxx_asm utility for use in assembling |
| @@ -1306,7 +1306,6 @@ scratch_ram { | |||
| 1306 | */ | 1306 | */ |
| 1307 | MWI_RESIDUAL { | 1307 | MWI_RESIDUAL { |
| 1308 | size 1 | 1308 | size 1 |
| 1309 | alias TARG_IMMEDIATE_SCB | ||
| 1310 | } | 1309 | } |
| 1311 | /* | 1310 | /* |
| 1312 | * SCBID of the next SCB to be started by the controller. | 1311 | * SCBID of the next SCB to be started by the controller. |
| @@ -1461,6 +1460,7 @@ scratch_ram { | |||
| 1461 | */ | 1460 | */ |
| 1462 | LAST_MSG { | 1461 | LAST_MSG { |
| 1463 | size 1 | 1462 | size 1 |
| 1463 | alias TARG_IMMEDIATE_SCB | ||
| 1464 | } | 1464 | } |
| 1465 | 1465 | ||
| 1466 | /* | 1466 | /* |