From b066fb5de455303fee461cf2954b7df38841b434 Mon Sep 17 00:00:00 2001
From: Devendra Naga <develkernel412222@gmail.com>
Date: Sun, 29 Jul 2012 03:19:23 +0000
Subject: [PATCH] --- yaml --- r: 320511 b: refs/heads/master c:
 ea4b3857861fe147137517da200d04cbbc91ad49 h: refs/heads/master i:   320509:
 5bc841209bdbc671207fa7cb91abf5aac8363340   320507:
 40887a1cc847fd6cc3b96c5d16436f3163097c9f   320503:
 7fe240f8c8c5664661d3776c5ab4eb1381988ce6   320495:
 65c5e0fdc6bd04a5f5d6959fa9464c7bbf499a0f   320479:
 759b15dabd5f6e4d3ba69a234473bc66ea6ed404   320447:
 41aadcfccb886b9cb0e9951c9ff373ec378f337d   320383:
 c042d87874f173afe052a9b5f13889848a491df9   320255:
 37c6886b62b84ec01fdaaaa85f48b443e4b81047   319999:
 0a16c7c16c56e36bb026005a1add972166357e77   319487:
 d09cb989ffa8800a3477e11992a2dc4609747e6f v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 64df2eac758d..e62a0d10708b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61648d91fc278fd1d500da8061d17e6920cd3500
+refs/heads/master: ea4b3857861fe147137517da200d04cbbc91ad49
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 9aaf863b4237..dd451c3dd83d 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -9360,8 +9360,7 @@ static int __devinit bnx2x_prev_mark_path(struct bnx2x *bp)
 	struct bnx2x_prev_path_list *tmp_list;
 	int rc;
 
-	tmp_list = (struct bnx2x_prev_path_list *)
-		    kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
+	tmp_list = kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
 	if (!tmp_list) {
 		BNX2X_ERR("Failed to allocate 'bnx2x_prev_path_list'\n");
 		return -ENOMEM;