Index: sys/ofed/include/linux/pci.h
===================================================================
--- sys/ofed/include/linux/pci.h	(revision 242823)
+++ sys/ofed/include/linux/pci.h	(working copy)
@@ -75,8 +75,8 @@ struct pci_device_id {
 
 #define PCI_VDEVICE(vendor, device)					\
 	    PCI_VENDOR_ID_##vendor, (device), PCI_ANY_ID, PCI_ANY_ID, 0, 0
-#define	PCI_DEVICE(vendor, device)					\
-	    (vendor), (device), PCI_ANY_ID, PCI_ANY_ID, 0, 0
+#define	PCI_DEVICE(vendor, device, ddata)				\
+	    (vendor), (device), PCI_ANY_ID, PCI_ANY_ID, 0, (ddata)
 
 #define	to_pci_dev(n)	container_of(n, struct pci_dev, dev)
 
Index: sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
===================================================================
--- sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c	(revision 242823)
+++ sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c	(working copy)
@@ -1249,26 +1249,26 @@ static void __devexit mthca_remove_one(struct pci_
 }
 
 static struct pci_device_id mthca_pci_table[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR),
-	  .driver_data = TAVOR },
-	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_TAVOR),
-	  .driver_data = TAVOR },
-	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT),
-	  .driver_data = ARBEL_COMPAT },
-	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT),
-	  .driver_data = ARBEL_COMPAT },
-	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_ARBEL),
-	  .driver_data = ARBEL_NATIVE },
-	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_ARBEL),
-	  .driver_data = ARBEL_NATIVE },
-	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_SINAI),
-	  .driver_data = SINAI },
-	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_SINAI),
-	  .driver_data = SINAI },
-	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_SINAI_OLD),
-	  .driver_data = SINAI },
-	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_SINAI_OLD),
-	  .driver_data = SINAI },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR,
+	  TAVOR) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_TAVOR,
+	  TAVOR) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX,
+	  PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT, ARBEL_COMPAT) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN,
+	  PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT, ARBEL_COMPAT) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_ARBEL,
+	  ARBEL_NATIVE) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_ARBEL,
+	  ARBEL_NATIVE) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_SINAI,
+	  SINAI) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_SINAI,
+	  SINAI) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_SINAI_OLD,
+	  SINAI) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_SINAI_OLD,
+	  SINAI) },
 	{ 0, }
 };