Patchwork [05/13] Revert "UBUNTU: SAUCE: Enable an e1000e Intel Corporation 82567 Gigabit controller"

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:17 p.m.
Message ID <1274483872.19284.3322.camel@emiko>
Download mbox | patch
Permalink /patch/53220/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:17 p.m.
>From 69ed2b95dec7d873e863a1edcbc957d091fadd7a Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 21 May 2010 14:53:17 -0700
Subject: [PATCH 05/13] Revert "UBUNTU: SAUCE: Enable an e1000e Intel Corporation 82567 Gigabit controller"

This reverts commit 09901736ece2d0d4082604d674e829720c8a90e4.

It was noted from an Intel contact that this could be dropped.  This ID
does not exist upstream and it is believed it was a temporary ID for
pre-released HW.  We can re-apply if anyone screams because they indeed
have this HW.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/net/e1000e/hw.h     |    1 -
 drivers/net/e1000e/netdev.c |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 8bfa3e2..8bdcd5f 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -371,7 +371,6 @@  enum e1e_registers {
 #define E1000_DEV_ID_ICH9_IGP_M_AMT		0x10F5
 #define E1000_DEV_ID_ICH9_IGP_M			0x10BF
 #define E1000_DEV_ID_ICH9_IGP_M_V		0x10CB
-#define E1000_DEV_ID_ICH9_IGP_M_V_2		0x10BE
 #define E1000_DEV_ID_ICH9_IGP_C			0x294C
 #define E1000_DEV_ID_ICH9_IFE			0x10C0
 #define E1000_DEV_ID_ICH9_IFE_GT		0x10C3
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 98d4aea..dbf8178 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5373,7 +5373,6 @@  static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
-	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V_2), board_ich9lan },
 
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },