diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 22:44:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 22:44:13 -0500 |
| commit | ae5dd8e346efc25a5f9cc9d01bc0915c40eb38d9 (patch) | |
| tree | 993d3486db9bd154859d20026875c11292e4e143 /drivers/ata/pata_legacy.c | |
| parent | 38f3323037de22bb0089d08be27be01196e7148b (diff) | |
| parent | 63ed71019c4437caef65fca1f83c990ae729024f (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:
pata_pdc202xx_old: fix data corruption and other problems
pata_legacy: fix io/irq mismatch
ahci: RAID mode SATA patch for Intel ICH9M
Diffstat (limited to 'drivers/ata/pata_legacy.c')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index fc5b73d78e00..86fbcd6a742b 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | #define NR_HOST 6 | 69 | #define NR_HOST 6 |
| 70 | 70 | ||
| 71 | static int legacy_port[NR_HOST] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 }; | 71 | static int legacy_port[NR_HOST] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 }; |
| 72 | static int legacy_irq[NR_HOST] = { 15, 14, 11, 10, 8, 12 }; | 72 | static int legacy_irq[NR_HOST] = { 14, 15, 11, 10, 8, 12 }; |
| 73 | 73 | ||
| 74 | struct legacy_data { | 74 | struct legacy_data { |
| 75 | unsigned long timing; | 75 | unsigned long timing; |