projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7796705
f1a58ec
)
Merge branch 'upstream-fixes' into upstream
author
Jeff Garzik
<jeff@garzik.org>
Tue, 22 Aug 2006 10:10:49 +0000
(06:10 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Tue, 22 Aug 2006 10:10:49 +0000
(06:10 -0400)
Conflicts:
drivers/ata/ata_piix.c
1
2
drivers/ata/ata_piix.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/ata/ata_piix.c
index
51d919c
,
01b3530
..
6846b56
---
1
/
drivers/ata/ata_piix.c
---
2
/
drivers/scsi/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;