From d81d673822908516bc3140253334cd3f894e7f22 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 1 Dec 2012 01:15:53 -0500
Subject: [PATCH] --- yaml --- r: 353752 b: refs/heads/master c:
 2fe119fd351870b1b159d4e117f77369475f150a h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/bcm/Adapter.h            | 2 +-
 trunk/drivers/staging/bcm/nvm.c                | 2 +-
 trunk/drivers/staging/bcm/nvm.h                | 4 ++--
 trunk/drivers/staging/bcm/vendorspecificextn.c | 2 +-
 trunk/drivers/staging/bcm/vendorspecificextn.h | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2f5bb491b234..c15ce5ad0d30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77b54101b548791bab732e93d6caa7d427204f19
+refs/heads/master: 2fe119fd351870b1b159d4e117f77369475f150a
diff --git a/trunk/drivers/staging/bcm/Adapter.h b/trunk/drivers/staging/bcm/Adapter.h
index f57794827f73..4231b6751d20 100644
--- a/trunk/drivers/staging/bcm/Adapter.h
+++ b/trunk/drivers/staging/bcm/Adapter.h
@@ -368,7 +368,7 @@ struct bcm_mini_adapter {
 	/*	BOOLEAN				InterfaceUpStatus; */
 	PFLASH2X_CS_INFO	psFlash2xCSInfo;
 	PFLASH_CS_INFO		psFlashCSInfo;
-	PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo;
+	struct bcm_flash2x_vendor_info *psFlash2xVendorInfo;
 	UINT			uiFlashBaseAdd; /* Flash start address */
 	UINT			uiActiveISOOffset; /* Active ISO offset chosen before f/w download */
 	enum bcm_flash2x_section_val eActiveISO; /* Active ISO section val */
diff --git a/trunk/drivers/staging/bcm/nvm.c b/trunk/drivers/staging/bcm/nvm.c
index 8c72e7d84933..468b3167a0f4 100644
--- a/trunk/drivers/staging/bcm/nvm.c
+++ b/trunk/drivers/staging/bcm/nvm.c
@@ -2241,7 +2241,7 @@ int BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter)
 		return -ENOMEM;
 	}
 
-	psAdapter->psFlash2xVendorInfo = (PFLASH2X_VENDORSPECIFIC_INFO)kzalloc(sizeof(FLASH2X_VENDORSPECIFIC_INFO), GFP_KERNEL);
+	psAdapter->psFlash2xVendorInfo = (struct bcm_flash2x_vendor_info *)kzalloc(sizeof(struct bcm_flash2x_vendor_info), GFP_KERNEL);
 	if (!psAdapter->psFlash2xVendorInfo) {
 		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Can't Allocate Vendor Info Memory for Flash 2.x");
 		kfree(psAdapter->psFlashCSInfo);
diff --git a/trunk/drivers/staging/bcm/nvm.h b/trunk/drivers/staging/bcm/nvm.h
index de9986496df5..849ff00e0e4c 100644
--- a/trunk/drivers/staging/bcm/nvm.h
+++ b/trunk/drivers/staging/bcm/nvm.h
@@ -127,10 +127,10 @@ typedef struct _VENDOR_SECTION_INFO {
 	u32 Reserved[16];
 } VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;
 
-typedef struct _FLASH2X_VENDORSPECIFIC_INFO {
+struct bcm_flash2x_vendor_info {
 	VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];
 	u32 Reserved[16];
-} FLASH2X_VENDORSPECIFIC_INFO, *PFLASH2X_VENDORSPECIFIC_INFO;
+};
 
 struct bcm_dsd_header {
 	u32 DSDImageSize;
diff --git a/trunk/drivers/staging/bcm/vendorspecificextn.c b/trunk/drivers/staging/bcm/vendorspecificextn.c
index 40be60aa909a..be1f91d955aa 100644
--- a/trunk/drivers/staging/bcm/vendorspecificextn.c
+++ b/trunk/drivers/staging/bcm/vendorspecificextn.c
@@ -11,7 +11,7 @@
 //		STATUS_SUCCESS/STATUS_FAILURE
 //
 //-----------------------------------------------------------------------------
-INT vendorextnGetSectionInfo(PVOID  pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo)
+INT vendorextnGetSectionInfo(PVOID  pContext, struct bcm_flash2x_vendor_info *pVendorInfo)
 {
 	return STATUS_FAILURE;
 }
diff --git a/trunk/drivers/staging/bcm/vendorspecificextn.h b/trunk/drivers/staging/bcm/vendorspecificextn.h
index 834410e29e75..52890d216edf 100644
--- a/trunk/drivers/staging/bcm/vendorspecificextn.h
+++ b/trunk/drivers/staging/bcm/vendorspecificextn.h
@@ -4,7 +4,7 @@
 
 #define CONTINUE_COMMON_PATH 0xFFFF
 
-INT vendorextnGetSectionInfo(PVOID  pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo);
+INT vendorextnGetSectionInfo(PVOID  pContext, struct bcm_flash2x_vendor_info *pVendorInfo);
 INT vendorextnExit(struct bcm_mini_adapter *Adapter);
 INT vendorextnInit(struct bcm_mini_adapter *Adapter);
 INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg);