From 8c94beeee7e104f4f47d64c62294bd9b84ea50b2 Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Mon, 28 Feb 2011 03:37:13 +0000
Subject: [PATCH] --- yaml --- r: 233842 b: refs/heads/master c:
 d4215ef71f4ec21c236a1f255f1808af2cfa6aa0 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_ethtool.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b3711e056ea..6f614511e36a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa6fcbbba110c7c4bc299bc90f59d9f7b51ac6e
+refs/heads/master: d4215ef71f4ec21c236a1f255f1808af2cfa6aa0
diff --git a/trunk/drivers/net/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
index b3da295c453c..5b0fe7a35ac8 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -1782,9 +1782,7 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 		{ 0x100, 0x350 }, /* manuf_info */
 		{ 0x450,  0xf0 }, /* feature_info */
 		{ 0x640,  0x64 }, /* upgrade_key_info */
-		{ 0x6a4,  0x64 },
 		{ 0x708,  0x70 }, /* manuf_key_info */
-		{ 0x778,  0x70 },
 		{     0,     0 }
 	};
 	__be32 buf[0x350 / 4];