diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 15:23:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:23:22 -0500 |
| commit | 4721d22160c2d37a2e8a0841578bbe8a937b7000 (patch) | |
| tree | c76fc72f3bb3bb7bf44e3781d35408d3987e9412 /drivers/net/ethernet/sfc/efx.c | |
| parent | 220b07e90e3b7b3adc60b8a72c79ad4465312072 (diff) | |
| parent | 70350b0685a370164ed8912835bd7109927c8781 (diff) | |
| download | linux-4721d22160c2d37a2e8a0841578bbe8a937b7000.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 44a82c6c60a7..e43702f33b62 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -2236,9 +2236,9 @@ static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = { {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, PCI_DEVICE_ID_SOLARFLARE_SFC4000B), .driver_data = (unsigned long) &falcon_b0_nic_type}, - {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID), + {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803), /* SFC9020 */ .driver_data = (unsigned long) &siena_a0_nic_type}, - {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID), + {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813), /* SFL9021 */ .driver_data = (unsigned long) &siena_a0_nic_type}, {0} /* end of list */ }; |