diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/aic7xxx/aic7xxx_osm.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index fd2b9785ff4f..8cb05dc8e6a1 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
| @@ -2290,7 +2290,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) | |||
| 2290 | * In the non-paging case, the sequencer will | 2290 | * In the non-paging case, the sequencer will |
| 2291 | * never re-reference the in-core SCB. | 2291 | * never re-reference the in-core SCB. |
| 2292 | * To make sure we are notified during | 2292 | * To make sure we are notified during |
| 2293 | * reslection, set the MK_MESSAGE flag in | 2293 | * reselection, set the MK_MESSAGE flag in |
| 2294 | * the card's copy of the SCB. | 2294 | * the card's copy of the SCB. |
| 2295 | */ | 2295 | */ |
| 2296 | if ((ahc->flags & AHC_PAGESCBS) == 0) { | 2296 | if ((ahc->flags & AHC_PAGESCBS) == 0) { |