diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:40:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:40:57 -0400 |
| commit | 21ba0f88ae56da82a3a15fe54d729208b64c4f4b (patch) | |
| tree | 17ce67f276fe3ea7284c3dc730bdd6a2ec7dfe2f /drivers/ata/pata_amd.c | |
| parent | dc690d8ef842b464f1c429a376ca16cb8dbee6ae (diff) | |
| parent | 36e235901f90fb83215be43cbd8f1ca14661ea40 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
PCI: Only build PCI syscalls on architectures that want them
PCI: limit pci_get_bus_and_slot to domain 0
PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
PCI: hotplug: pciehp: wait for 1 second after power off slot
PCI: pci_set_power_state(): check for PM capabilities earlier
PCI: cpci_hotplug: Convert to use the kthread API
PCI: add pci_try_set_mwi
PCI: pcie: remove SPIN_LOCK_UNLOCKED
PCI: ROUND_UP macro cleanup in drivers/pci
PCI: remove pci_dac_dma_... APIs
PCI: pci-x-pci-express-read-control-interfaces cleanups
PCI: Fix typo in include/linux/pci.h
PCI: pci_ids, remove double or more empty lines
PCI: pci_ids, add atheros and 3com_2 vendors
PCI: pci_ids, reorder some entries
PCI: i386: traps, change VENDOR to DEVICE
PCI: ATM: lanai, change VENDOR to DEVICE
PCI: Change all drivers to use pci_device->revision
...
Diffstat (limited to 'drivers/ata/pata_amd.c')
| -rw-r--r-- | drivers/ata/pata_amd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index b9c44c575ce3..b09facad63e1 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
| @@ -623,17 +623,15 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 623 | const struct ata_port_info *ppi[] = { NULL, NULL }; | 623 | const struct ata_port_info *ppi[] = { NULL, NULL }; |
| 624 | static int printed_version; | 624 | static int printed_version; |
| 625 | int type = id->driver_data; | 625 | int type = id->driver_data; |
| 626 | u8 rev; | ||
| 627 | u8 fifo; | 626 | u8 fifo; |
| 628 | 627 | ||
| 629 | if (!printed_version++) | 628 | if (!printed_version++) |
| 630 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); | 629 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
| 631 | 630 | ||
| 632 | pci_read_config_byte(pdev, PCI_REVISION_ID, &rev); | ||
| 633 | pci_read_config_byte(pdev, 0x41, &fifo); | 631 | pci_read_config_byte(pdev, 0x41, &fifo); |
| 634 | 632 | ||
| 635 | /* Check for AMD7409 without swdma errata and if found adjust type */ | 633 | /* Check for AMD7409 without swdma errata and if found adjust type */ |
| 636 | if (type == 1 && rev > 0x7) | 634 | if (type == 1 && pdev->revision > 0x7) |
| 637 | type = 2; | 635 | type = 2; |
| 638 | 636 | ||
| 639 | /* Check for AMD7411 */ | 637 | /* Check for AMD7411 */ |