Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[pandora-kernel.git] / drivers / net / ethernet / sfc / efx.c

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index de9afeb..d5731f1 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2229,13 +2229,15 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
 
 /* PCI device ID table */
 static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {
-       {PCI_DEVICE(EFX_VENDID_SFC, FALCON_A_P_DEVID),
+       {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
+                   PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0),
         .driver_data = (unsigned long) &falcon_a1_nic_type},
-       {PCI_DEVICE(EFX_VENDID_SFC, FALCON_B_P_DEVID),
+       {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
+                   PCI_DEVICE_ID_SOLARFLARE_SFC4000B),
         .driver_data = (unsigned long) &falcon_b0_nic_type},
-       {PCI_DEVICE(EFX_VENDID_SFC, BETHPAGE_A_P_DEVID),
+       {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),
         .driver_data = (unsigned long) &siena_a0_nic_type},
-       {PCI_DEVICE(EFX_VENDID_SFC, SIENA_A_P_DEVID),
+       {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),
         .driver_data = (unsigned long) &siena_a0_nic_type},
        {0}                     /* end of list */
 };