From 20664ecccb009b4622d1a3a07c4c1e79bd825b22 Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Wed, 6 Oct 2010 03:29:41 +0000
Subject: [PATCH] --- yaml --- r: 214946 b: refs/heads/master c:
 c518cd1c7aca2e2a65edcf4fa5ce4160d59878c2 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/bnx2x/bnx2x.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index bc39fdf882c3..3de5fe3942cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 749a85033ec7c5c0fa54a0023fd5d59eb5e57a20
+refs/heads/master: c518cd1c7aca2e2a65edcf4fa5ce4160d59878c2
diff --git a/trunk/drivers/net/bnx2x/bnx2x.h b/trunk/drivers/net/bnx2x/bnx2x.h
index 6f8e2666f05f..9b78a0487791 100644
--- a/trunk/drivers/net/bnx2x/bnx2x.h
+++ b/trunk/drivers/net/bnx2x/bnx2x.h
@@ -1053,15 +1053,8 @@ struct bnx2x {
 #ifdef BCM_CNIC
 	u32			cnic_flags;
 #define BNX2X_CNIC_FLAG_MAC_SET		1
-
-	void			*t1;
-	dma_addr_t		t1_mapping;
 	void			*t2;
 	dma_addr_t		t2_mapping;
-	void			*timers;
-	dma_addr_t		timers_mapping;
-	void			*qm;
-	dma_addr_t		qm_mapping;
 	struct cnic_ops		*cnic_ops;
 	void			*cnic_data;
 	u32			cnic_tag;