diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:30:40 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:30:40 -0400 |
commit | 029f5468b5b5f93a09bf90326fdcb9124079658d (patch) | |
tree | f869fb02ad1ca49e0920e073b22cbb96a184ccae /drivers/scsi/sata_vsc.c | |
parent | 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 (diff) | |
parent | 1ad8e7f9eb051b040880e45337ed74bfd916ef7f (diff) |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
-rw-r--r-- | drivers/scsi/sata_vsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 5af6d5f9f4bd..b7d6a31628c2 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
@@ -229,7 +229,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, | |||
229 | handled++; | 229 | handled++; |
230 | } | 230 | } |
231 | 231 | ||
232 | if (ap && !(ap->flags & ATA_FLAG_PORT_DISABLED)) { | 232 | if (ap && !(ap->flags & ATA_FLAG_DISABLED)) { |
233 | struct ata_queued_cmd *qc; | 233 | struct ata_queued_cmd *qc; |
234 | 234 | ||
235 | qc = ata_qc_from_tag(ap, ap->active_tag); | 235 | qc = ata_qc_from_tag(ap, ap->active_tag); |