summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-07-09 18:15:59 +0000
committerjkim <jkim@FreeBSD.org>2013-07-09 18:15:59 +0000
commitf7817d8e295e51966a72e15f02c934d233ec3b1b (patch)
tree6cc6fde2311f6fd2787c43312cac0d1625c49be0
parent9bfe2ac5dd08af286e1fbba35062cd9f06b0e111 (diff)
downloadFreeBSD-src-f7817d8e295e51966a72e15f02c934d233ec3b1b.zip
FreeBSD-src-f7817d8e295e51966a72e15f02c934d233ec3b1b.tar.gz
Remove redundant definitions to appease tinderbox.
-rw-r--r--sys/dev/ixgb/if_ixgb.c4
-rw-r--r--sys/dev/ixgb/ixgb_ids.h6
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 69a8fb9..6e46696 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -72,8 +72,8 @@ char ixgb_copyright[] = "Copyright (c) 2001-2004 Intel Corporation.";
static ixgb_vendor_info_t ixgb_vendor_info_array[] =
{
/* Intel(R) PRO/10000 Network Connection */
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0},
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0},
+ {IXGB_VENDOR_ID, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0},
+ {IXGB_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0},
/* required last entry */
{0, 0, 0, 0, 0}
};
diff --git a/sys/dev/ixgb/ixgb_ids.h b/sys/dev/ixgb/ixgb_ids.h
index a224f63..d268eeb 100644
--- a/sys/dev/ixgb/ixgb_ids.h
+++ b/sys/dev/ixgb/ixgb_ids.h
@@ -37,13 +37,9 @@
#define _IXGB_IDS_H_
/**********************************************************************
-** The Device and Vendor IDs for 10 Gigabit MACs
+** The Device IDs for 10 Gigabit MACs
**********************************************************************/
-#define INTEL_VENDOR_ID 0x8086
-#define INTEL_SUBVENDOR_ID 0x8086
-
-
#define IXGB_DEVICE_ID_82597EX 0x1048 /* Cibolo A1, -LR (1310nm) */
#define IXGB_DEVICE_ID_82597EX_SR 0x1A48 /* Cibolo B0, -SR (850nm) */
OpenPOWER on IntegriCloud