--- drivers/ata/ahci.c

+++ drivers/ata/ahci.c

@@ -576,11 +576,6 @@ static const struct pci_device_id ahci_p

{ PCI_VDEVICE(INTEL, 0x1c05), board_ahci }, /* CPT RAID */

{ PCI_VDEVICE(INTEL, 0x1c06), board_ahci }, /* CPT RAID */

{ PCI_VDEVICE(INTEL, 0x1c07), board_ahci }, /* CPT RAID */

- { PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */

- { PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */

- { PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */

- { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */

- { PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */

/* JMicron 360/1/3/5/6, match class to avoid IDE function */

{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

@@ -3042,16 +3037,6 @@ static int ahci_init_one(struct pci_dev

if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)

return -ENODEV;

- /*

- * For some reason, MCP89 on MacBook 7,1 doesn't work with

- * ahci, use ata_generic instead.

- */

- if (pdev->vendor == PCI_VENDOR_ID_NVIDIA &&

- pdev->device == PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA &&

- pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&

- pdev->subsystem_device == 0xcb89)

- return -ENODEV;

-

/* acquire resources */

rc = pcim_enable_device(pdev);

if (rc)