summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-09-04 16:25:25 +0100
committerJeff Garzik <jgarzik@redhat.com>2012-09-13 00:24:29 -0400
commit7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1 (patch)
treedc5bf891feb0575ba510790d55b16daa534d0f76 /drivers
parent17c60c6b763cb5b83b0185e7d38d01d18e55a05a (diff)
downloadlinux-3.10-7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1.tar.gz
linux-3.10-7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1.tar.bz2
linux-3.10-7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1.zip
ahci: Add identifiers for ASM106x devices
They don't always appear as AHCI class devices but instead as IDE class. Based on an initial patch by Hiroaki Nito Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=42804 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/ahci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 51548dd6097..7862d17976b 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -405,7 +405,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
/* Asmedia */
- { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1061 */
+ { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */
+ { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */
+ { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */
+ { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */
/* Generic, PCI class code for AHCI */
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,