From 60c4c54a861baf17bd6796ab4b6f1ee891a16b34 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Thu, 15 Jul 2010 08:41:08 +0000
Subject: [PATCH] --- yaml --- r: 203587 b: refs/heads/master c:
 535222880309ff6861d3aae94c809323d3ca07b1 h: refs/heads/master i:   203585:
 9d71b5fb2ae1a0e476ba8617db77042f43cee25f   203583:
 440d8e9edc8f16a1f8fc8d9945fd26aca883743b v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/atm/eni.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 122a11393d9e..f2c0cd2d59b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12c8471a1e8af98b7e9a6917c393e0f85b582550
+refs/heads/master: 535222880309ff6861d3aae94c809323d3ca07b1
diff --git a/trunk/drivers/atm/eni.c b/trunk/drivers/atm/eni.c
index 90a5a7cac740..80f9f3659e4d 100644
--- a/trunk/drivers/atm/eni.c
+++ b/trunk/drivers/atm/eni.c
@@ -2269,10 +2269,8 @@ static int __devinit eni_init_one(struct pci_dev *pci_dev,
 
 
 static struct pci_device_id eni_pci_tbl[] = {
-	{ PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_FPGA, PCI_ANY_ID, PCI_ANY_ID,
-	  0, 0, 0 /* FPGA */ },
-	{ PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_ASIC, PCI_ANY_ID, PCI_ANY_ID,
-	  0, 0, 1 /* ASIC */ },
+	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },
+	{ PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci,eni_pci_tbl);