igb: Remove id's that will not be productized for Linux.

This patch removes id defines from the hardware files that will not be
productized for Linux.  These id's were not implemented for support in the
base driver itself, they were just available defines.

Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index d3d72e0dfe3e81fa470e2a1ea0f6a663ef8e5dfd..ff6a17cb136280ec5547b128c74126e757f6bd52 100644 (file)
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -443,8 +443,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                mac->type = e1000_i350;
                break;
        case E1000_DEV_ID_I210_COPPER:
-       case E1000_DEV_ID_I210_COPPER_OEM1:
-       case E1000_DEV_ID_I210_COPPER_IT:
        case E1000_DEV_ID_I210_FIBER:
        case E1000_DEV_ID_I210_SERDES:
        case E1000_DEV_ID_I210_SGMII:

diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index f1dbab9202862118004abf5f935594de612123a9..488abb24a54f9f5d3cdb91e2df45f464a03ecdea 100644 (file)
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -64,8 +64,6 @@ struct e1000_hw;
 #define E1000_DEV_ID_I350_SERDES               0x1523
 #define E1000_DEV_ID_I350_SGMII                        0x1524
 #define E1000_DEV_ID_I210_COPPER               0x1533
-#define E1000_DEV_ID_I210_COPPER_OEM1          0x1534
-#define E1000_DEV_ID_I210_COPPER_IT            0x1535
 #define E1000_DEV_ID_I210_FIBER                        0x1536
 #define E1000_DEV_ID_I210_SERDES               0x1537
 #define E1000_DEV_ID_I210_SGMII                        0x1538