diff options
| author | Paul Mackerras | 2008-12-16 04:38:58 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2008-12-16 04:38:58 +0100 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/ata/pata_hpt366.c | |
| parent | powerpc/85xx: Fix compile issues with mpc8572ds.dts (diff) | |
| parent | powerpc/cell/axon-msi: Fix MSI after kexec (diff) | |
| download | kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.gz kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/ata/pata_hpt366.c')
| -rw-r--r-- | drivers/ata/pata_hpt366.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index f2b83eabc7c7..a098ba8eaab6 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c @@ -382,10 +382,10 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) /* PCI clocking determines the ATA timing values to use */ /* info_hpt366 is safe against re-entry so we can scribble on it */ switch((reg1 & 0x700) >> 8) { - case 5: + case 9: hpriv = &hpt366_40; break; - case 9: + case 5: hpriv = &hpt366_25; break; default: |