Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / drivers / ata / pata_cs5535.c

diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index d33aa28239a93e39e07179cea995bbc5038590ec..403f56165cecd50674bc29955d812436e34a2a9d 100644 (file)
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -202,7 +202,8 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 }
 
 static const struct pci_device_id cs5535[] = {
-       { PCI_VDEVICE(NS, 0x002D), },
+       { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), },
+       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), },
 
        { },
 };