commit 029f5468b5b5f93a09bf90326fdcb9124079658d
author Jeff Garzik <jeff@garzik.org> Sun Apr 02 10:30:40 2006 -0400
committer Jeff Garzik <jeff@garzik.org> Sun Apr 02 10:30:40 2006 -0400
tree f869fb02ad1ca49e0920e073b22cbb96a184ccae
parent 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110
parent 1ad8e7f9eb051b040880e45337ed74bfd916ef7f

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

drivers/scsi/sata_mv.c

diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index dc54f29..fd9f217 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -1397,7 +1397,7 @@
 			}
 		}
 
-		if (ap && (ap->flags & ATA_FLAG_PORT_DISABLED))
+		if (ap && (ap->flags & ATA_FLAG_DISABLED))
 			continue;
 
 		err_mask = ac_err_mask(ata_status);