diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-04 15:34:15 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-04 15:34:15 -0600 |
| commit | b1267d60ce106be38a136b51a9edbf7c172b9dae (patch) | |
| tree | 6539c8f1dea4f6368162779f0b6954b916dd21e2 /drivers/ata/ahci.c | |
| parent | 278934bdc46a3de02f24c6d4a550cf668aa8cf83 (diff) | |
| parent | b996ac90f595dda271cbd858b136b45557fc1a57 (diff) | |
Merge branch 'pci/shane-amd-ahci-i2c' into next
* pci/shane-amd-ahci-i2c:
i2c-piix4: Add AMD CZ SMBus device ID
ahci: Add AMD CZ SATA device ID
PCI: Put Hudson-2 device IDs together
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 251e57d3894..98496600a15 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -310,6 +310,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { /* AMD */ { PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */ + { PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */ /* AMD is using RAID class only for ahci controllers */ { PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, |