From 9c8611dbcf10c0749ca48e6f285759637725c3cc Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Wed, 4 Jan 2012 13:02:24 +0000
Subject: [PATCH] --- yaml --- r: 279495 b: refs/heads/master c:
 e1e0918fcaea7b8100ed9f96f3ecd9eb9b867102 h: refs/heads/master i:   279493:
 8b403b19f237dbbcdde39d6c02cb89af1eb05a4f   279491:
 dea5beeef7af5c7b4e67b1836c4a7e911ffa0aaa   279487:
 53500ba5c9bd9989478d723814d4e0f4100cecac v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/ethernet/brocade/bna/bna_types.h | 6 +++---
 trunk/drivers/net/ethernet/brocade/bna/bnad.c      | 6 +++---
 trunk/drivers/net/ethernet/brocade/bna/bnad.h      | 2 +-
 trunk/drivers/net/ethernet/brocade/bna/cna_fwimg.c | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0bfb309a20df..fe3dd86445ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 975419cf01fc6997879196d1c8f5ebffd30d3b20
+refs/heads/master: e1e0918fcaea7b8100ed9f96f3ecd9eb9b867102
diff --git a/trunk/drivers/net/ethernet/brocade/bna/bna_types.h b/trunk/drivers/net/ethernet/brocade/bna/bna_types.h
index 8e57fc5c5868..e8d3ab7ea6cb 100644
--- a/trunk/drivers/net/ethernet/brocade/bna/bna_types.h
+++ b/trunk/drivers/net/ethernet/brocade/bna/bna_types.h
@@ -427,7 +427,7 @@ struct bna_ethport {
 
 /* Doorbell structure */
 struct bna_ib_dbell {
-	void *__iomem doorbell_addr;
+	void __iomem   *doorbell_addr;
 	u32		doorbell_ack;
 };
 
@@ -463,7 +463,7 @@ struct bna_tcb {
 	u32		consumer_index;
 	volatile u32	*hw_consumer_index;
 	u32		q_depth;
-	void *__iomem q_dbell;
+	void __iomem   *q_dbell;
 	struct bna_ib_dbell *i_dbell;
 	int			page_idx;
 	int			page_count;
@@ -599,7 +599,7 @@ struct bna_rcb {
 	u32		producer_index;
 	u32		consumer_index;
 	u32		q_depth;
-	void *__iomem q_dbell;
+	void __iomem   *q_dbell;
 	int			page_idx;
 	int			page_count;
 	/* Control path */
diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad.c b/trunk/drivers/net/ethernet/brocade/bna/bnad.c
index 2eddbaa5db47..be7d91e4b785 100644
--- a/trunk/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/trunk/drivers/net/ethernet/brocade/bna/bnad.c
@@ -53,9 +53,9 @@ MODULE_PARM_DESC(bna_debugfs_enable, "Enables debugfs feature, default=1,"
  * Global variables
  */
 u32 bnad_rxqs_per_cq = 2;
-u32 bna_id;
-struct mutex bnad_list_mutex;
-LIST_HEAD(bnad_list);
+static u32 bna_id;
+static struct mutex bnad_list_mutex;
+static LIST_HEAD(bnad_list);
 static const u8 bnad_bcast_addr[] =  {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 /*
diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad.h b/trunk/drivers/net/ethernet/brocade/bna/bnad.h
index c975ce672f48..55824d92699f 100644
--- a/trunk/drivers/net/ethernet/brocade/bna/bnad.h
+++ b/trunk/drivers/net/ethernet/brocade/bna/bnad.h
@@ -347,7 +347,7 @@ struct bnad_drvinfo {
 /*
  * EXTERN VARIABLES
  */
-extern struct firmware *bfi_fw;
+extern const struct firmware *bfi_fw;
 extern u32		bnad_rxqs_per_cq;
 
 /*
diff --git a/trunk/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/trunk/drivers/net/ethernet/brocade/bna/cna_fwimg.c
index 725b9fff337f..cfc22a64157e 100644
--- a/trunk/drivers/net/ethernet/brocade/bna/cna_fwimg.c
+++ b/trunk/drivers/net/ethernet/brocade/bna/cna_fwimg.c
@@ -16,6 +16,7 @@
  * www.brocade.com
  */
 #include <linux/firmware.h>
+#include "bnad.h"
 #include "bfi.h"
 #include "cna.h"