From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 22 Aug 2006 10:10:49 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1262^2~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f89b2b5ddcace8959f760c0556369bd19bda0548;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/ata/ata_piix.c
---

f89b2b5ddcace8959f760c0556369bd19bda0548
diff --cc drivers/ata/ata_piix.c
index 51d919c8073,01b3530cf6d..6846b5629ed
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@@ -550,8 -548,8 +548,8 @@@ static unsigned int piix_sata_present_m
  	struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
  	struct piix_host_priv *hpriv = ap->host_set->private_data;
  	const unsigned int *map = hpriv->map;
 -	int base = 2 * ap->hard_port_no;
 +	int base = 2 * ap->port_no;
- 	unsigned int present = 0;
+ 	unsigned int present_mask = 0;
  	int port, i;
  	u16 pcs;