From 1d606f7ec17ac0bfe88eb5ca898041eda6510ffb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 2 Dec 2011 18:23:56 +0000 Subject: [PATCH] --- yaml --- r: 278821 b: refs/heads/master c: 547c474fa7dffeff312a8568d243f5f1fe84938c h: refs/heads/master i: 278819: a33bbfde9984f56b5df3df3372d50a16945a788f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/efx.c | 4 ++-- trunk/drivers/net/ethernet/sfc/efx.h | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1c1048a273e7..5ec16cc9de46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8431a27ad5af8e52b4cd2d9e15c2a23670845b18 +refs/heads/master: 547c474fa7dffeff312a8568d243f5f1fe84938c diff --git a/trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/ethernet/sfc/efx.c index 14e134d3b4d7..9cf3eab11835 100644 --- a/trunk/drivers/net/ethernet/sfc/efx.c +++ b/trunk/drivers/net/ethernet/sfc/efx.c @@ -2235,9 +2235,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 */ }; diff --git a/trunk/drivers/net/ethernet/sfc/efx.h b/trunk/drivers/net/ethernet/sfc/efx.h index 4764793ed234..8a5336d86a12 100644 --- a/trunk/drivers/net/ethernet/sfc/efx.h +++ b/trunk/drivers/net/ethernet/sfc/efx.h @@ -14,10 +14,6 @@ #include "net_driver.h" #include "filter.h" -/* PCI IDs */ -#define BETHPAGE_A_P_DEVID 0x0803 -#define SIENA_A_P_DEVID 0x0813 - /* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&3) for memory */ #define EFX_MEM_BAR 2