From 0ae254a54740a0c41191bb4a4717b436b7bdf0cd Mon Sep 17 00:00:00 2001
From: Yuval Mintz <yuvalmin@broadcom.com>
Date: Tue, 3 Apr 2012 18:41:23 +0000
Subject: [PATCH] --- yaml --- r: 300447 b: refs/heads/master c:
 ef81442f728ffcf30ccbc6db253df8e35a5182c4 h: refs/heads/master i:   300445:
 140979adac5c77b713f66ab3ea712db524d7980d   300443:
 77141f17e7bbd886bef968601b275ad040b9269e   300439:
 bdef6498e7a46b7d8314189a0deffcc5efab44a8   300431:
 daf76c6a62a6856648da6e85345398c496e1c472   300415:
 815f0fde3473fb585709e613af569d7ea598719d v: v3

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

diff --git a/[refs] b/[refs]
index 2435abb4ab78..78969d9580a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc90cb3b2429a0f0681331fa5c501f91eee4f633
+refs/heads/master: ef81442f728ffcf30ccbc6db253df8e35a5182c4
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 44556b719e81..02e14a34b378 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -23,7 +23,6 @@
 #include <linux/ip.h>
 #include <net/ipv6.h>
 #include <net/ip6_checksum.h>
-#include <linux/firmware.h>
 #include <linux/prefetch.h>
 #include "bnx2x_cmn.h"
 #include "bnx2x_init.h"
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 2cc0a1703970..93b5fc4dea66 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -22,13 +22,10 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/crc32.h>
-
-
 #include "bnx2x.h"
 #include "bnx2x_cmn.h"
 #include "bnx2x_dump.h"
 #include "bnx2x_init.h"
-#include "bnx2x_sp.h"
 
 /* Note: in the format strings below %s is replaced by the queue-name which is
  * either its index or 'fcoe' for the fcoe queue. Make sure the format string
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index e077d2508727..db5fb4e15127 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -39,7 +39,6 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#include <linux/if.h>
 #include <linux/if_vlan.h>
 #include <net/ip.h>
 #include <net/ipv6.h>