diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 20:11:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 20:11:44 -0400 |
| commit | f1518a088bde6aea49e7c472ed6ab96178fcba3e (patch) | |
| tree | 51d940efef6b7594a3152f4cdd65ae56ebae5f17 /drivers/ata/ahci.c | |
| parent | 2090dee420911045258d50239dc2c527e4b1dd06 (diff) | |
| parent | 5fe675e2b3e41349deb0c81667065b9cb229ea1d (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
fix module_param mistake in it821x
ahci: fix PORTS_IMPL override
kerneldoc fix in libata
libata: more NONCQ devices
pata_it821x: (partially) fix DMA in RAID mode
PATA: Add the MCP73/77 support to PATA driver
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 545f330e59a5..ca5229d24d8e 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -527,7 +527,7 @@ static void ahci_save_initial_config(struct pci_dev *pdev, | |||
| 527 | 527 | ||
| 528 | /* fixup zero port_map */ | 528 | /* fixup zero port_map */ |
| 529 | if (!port_map) { | 529 | if (!port_map) { |
| 530 | port_map = (1 << ahci_nr_ports(hpriv->cap)) - 1; | 530 | port_map = (1 << ahci_nr_ports(cap)) - 1; |
| 531 | dev_printk(KERN_WARNING, &pdev->dev, | 531 | dev_printk(KERN_WARNING, &pdev->dev, |
| 532 | "PORTS_IMPL is zero, forcing 0x%x\n", port_map); | 532 | "PORTS_IMPL is zero, forcing 0x%x\n", port_map); |
| 533 | 533 | ||