From 84207c6ee387195f19d7778a63e44f6ca0ecefbc Mon Sep 17 00:00:00 2001
From: Keng-Yu Lin <kengyu@canonical.com>
Date: Wed, 9 Nov 2011 01:47:36 -0500
Subject: [PATCH] --- yaml --- r: 275336 b: refs/heads/master c:
 c9703765f3d5ab27909011dee4a05affe48e4442 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ata/ahci.c      | 3 +++
 trunk/include/linux/pci_ids.h | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6e16edf15a05..9866fd18861e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a46c0780babea7d0b3f277a33ea243be38eb942
+refs/heads/master: c9703765f3d5ab27909011dee4a05affe48e4442
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index fb7b90b05922..cf26222a93c5 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/drivers/ata/ahci.c
@@ -390,6 +390,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 	/* Promise */
 	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */
 
+	/* Asmedia */
+	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1061 */
+
 	/* Generic, PCI class code for AHCI */
 	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
 	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index 3fdf251389de..172ba70306d1 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/include/linux/pci_ids.h
@@ -2405,6 +2405,8 @@
 
 #define PCI_VENDOR_ID_AZWAVE		0x1a3b
 
+#define PCI_VENDOR_ID_ASMEDIA		0x1b21
+
 #define PCI_VENDOR_ID_TEKRAM		0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290	0xdc29