[libata] Move some PCI IDs from sata_nv to ahci

The content of memory map io of BAR5 have been change from MCP65 then
sata_nv can't work fine on the platform based on MCP65 and MCP67, so move
their IDs from sata_nv.c to ahci.c.

Signed-off-by: Peer Chen <pchen@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index dbae6d971041..b517d2493551 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -402,6 +402,14 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci },            /* MCP65 */
         { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci },            /* MCP65 */
         { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045c), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045d), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045e), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045f), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0553), board_ahci },            /* MCP67 */
         { PCI_VDEVICE(NVIDIA, 0x0554), board_ahci },            /* MCP67 */
         { PCI_VDEVICE(NVIDIA, 0x0555), board_ahci },            /* MCP67 */
         { PCI_VDEVICE(NVIDIA, 0x0556), board_ahci },            /* MCP67 */
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0d316eb3c214..f6d498e1cf80 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -270,14 +270,6 @@ static const struct pci_device_id nv_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },
-        { PCI_VDEVICE(NVIDIA, 0x045c), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045d), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045e), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045f), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x0550), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0551), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0552), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0553), GENERIC }, /* MCP67 */
         { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
                 PCI_ANY_ID, PCI_ANY_ID,
                 PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },