From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 30 Mar 2006 00:43:31 +0000 (-0500)
Subject: Merge branch 'mv-merge'
X-Git-Tag: v2.6.17-rc1~146^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=55d8ca4f8094246da6e71889a4e04bfafaa78b10;p=linux-2.6-omap-h63xx.git

Merge branch 'mv-merge'

Conflicts:

	drivers/scsi/sata_mv.c
---

55d8ca4f8094246da6e71889a4e04bfafaa78b10
diff --cc drivers/scsi/sata_mv.c
index 275ed9bd898,33e38735438..fa901fd6508
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -1372,8 -1209,8 +1371,10 @@@ static void mv_host_intr(struct ata_hos
  		hc,relevant,hc_irq_cause);
  
  	for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
 +		u8 ata_status = 0;
- 		ap = host_set->ports[port];
+ 		struct ata_port *ap = host_set->ports[port];
+ 		struct mv_port_priv *pp = ap->private_data;
++
  		hard_port = port & MV_PORT_MASK;	/* range 0-3 */
  		handled = 0;	/* ensure ata_status is set if handled++ */