diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:32:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:32:23 +1100 |
| commit | 509a2a65821b2dcc67030aa12792c88c45174d1a (patch) | |
| tree | 0612889cfa1514e03630069fbbad96d5beee7f18 /drivers/net | |
| parent | 5220c87d9995479df9aded33841d9d9bac523ece (diff) | |
| parent | 00fa2b191b4bd74e9d22ac177e3d9e8ecd3582d3 (diff) | |
Merge remote-tracking branch 'scsi/master'
Conflicts:
drivers/scsi/libsas/sas_ata.c
drivers/scsi/libsas/sas_scsi_host.c
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index d584d32c747d..85ca5e8db6a7 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -145,13 +145,6 @@ static struct { { "Broadcom NetXtreme II BCM57712E XGb" } }; -#ifndef PCI_DEVICE_ID_NX2_57712 -#define PCI_DEVICE_ID_NX2_57712 0x1662 -#endif -#ifndef PCI_DEVICE_ID_NX2_57712E -#define PCI_DEVICE_ID_NX2_57712E 0x1663 -#endif - static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = { { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 }, { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 }, |