diff --git a/[refs] b/[refs]
index c15ce5ad0d30..e129af9b95b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fe119fd351870b1b159d4e117f77369475f150a
+refs/heads/master: ad2f522cc6ff6db7dc4b650353739247debc293d
diff --git a/trunk/drivers/staging/bcm/nvm.h b/trunk/drivers/staging/bcm/nvm.h
index 849ff00e0e4c..728a63273528 100644
--- a/trunk/drivers/staging/bcm/nvm.h
+++ b/trunk/drivers/staging/bcm/nvm.h
@@ -120,15 +120,15 @@ typedef struct _FLASH_2X_CS_INFO {
 	/* All expansions to the control data structure should add here */
 } FLASH2X_CS_INFO, *PFLASH2X_CS_INFO;
 
-typedef struct _VENDOR_SECTION_INFO {
+struct bcm_vendor_section_info {
 	u32 OffsetFromZeroForSectionStart;
 	u32 OffsetFromZeroForSectionEnd;
 	u32 AccessFlags;
 	u32 Reserved[16];
-} VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;
+};
 
 struct bcm_flash2x_vendor_info {
-	VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];
+	struct bcm_vendor_section_info VendorSection[TOTAL_SECTIONS];
 	u32 Reserved[16];
 };