Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[linux-2.6] / drivers / ata / pata_triflex.c

diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index a954ed93a40ca48a4ba8b4c5d71d23c549d5fc81..9640f80e8b0d9bbb6bfdc2e9004ec3f9c9be6412 100644 (file)
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -248,13 +248,13 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 }
 
 static const struct pci_device_id triflex[] = {
-       { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE,
-                                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { 0, },
+       { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE), },
+
+       { },
 };
 
 static struct pci_driver triflex_pci_driver = {
-        .name          = DRV_NAME,
+       .name           = DRV_NAME,
        .id_table       = triflex,
        .probe          = triflex_init_one,
        .remove         = ata_pci_remove_one
@@ -265,13 +265,11 @@ static int __init triflex_init(void)
        return pci_register_driver(&triflex_pci_driver);
 }
 
-
 static void __exit triflex_exit(void)
 {
        pci_unregister_driver(&triflex_pci_driver);
 }
 
-
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("low-level driver for Compaq Triflex");
 MODULE_LICENSE("GPL");