From 4fcb53c86e472f0836d83e8a98257c9e032fe020 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 1 Dec 2012 01:15:46 -0500
Subject: [PATCH] --- yaml --- r: 353745 b: refs/heads/master c:
 72a57c08b5eaddd64174940ff5f9edf269ca7f9d h: refs/heads/master i:   353743:
 d138e6173c4ad057336ce8991b2ab8a75ee0d371 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/staging/bcm/nvm.h | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 38f8664196aa..d576a11a2286 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04ac0434c10e4b57db3f8b6d49010b8fd5213b3c
+refs/heads/master: 72a57c08b5eaddd64174940ff5f9edf269ca7f9d
diff --git a/trunk/drivers/staging/bcm/nvm.h b/trunk/drivers/staging/bcm/nvm.h
index 5544975c242f..36a970718ed9 100644
--- a/trunk/drivers/staging/bcm/nvm.h
+++ b/trunk/drivers/staging/bcm/nvm.h
@@ -21,14 +21,12 @@
 #ifndef _NVM_H_
 #define _NVM_H_
 
-typedef struct _FLASH_SECTOR_INFO
-{
+typedef struct _FLASH_SECTOR_INFO {
 	UINT uiSectorSig;
 	UINT uiSectorSize;
 } FLASH_SECTOR_INFO, *PFLASH_SECTOR_INFO;
 
-typedef struct _FLASH_CS_INFO
-{
+typedef struct _FLASH_CS_INFO {
 	B_UINT32 MagicNumber;
 	/* let the magic number be 0xBECE-F1A5 - F1A5 for "flas-h" */
 	B_UINT32 FlashLayoutVersion;
@@ -60,8 +58,7 @@ typedef struct _FLASH_CS_INFO
 #define FLASH2X_TOTAL_SIZE	(64 * 1024 * 1024)
 #define DEFAULT_SECTOR_SIZE	(64 * 1024)
 
-typedef struct _FLASH_2X_CS_INFO
-{
+typedef struct _FLASH_2X_CS_INFO {
 	/* magic number as 0xBECE-F1A5 - F1A5 for "flas-h" */
 	B_UINT32 MagicNumber;
 	B_UINT32 FlashLayoutVersion;
@@ -123,22 +120,19 @@ 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
-{
+typedef struct _VENDOR_SECTION_INFO {
 	B_UINT32 OffsetFromZeroForSectionStart;
 	B_UINT32 OffsetFromZeroForSectionEnd;
 	B_UINT32 AccessFlags;
 	B_UINT32 Reserved[16];
 } VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;
 
-typedef struct _FLASH2X_VENDORSPECIFIC_INFO
-{
+typedef struct _FLASH2X_VENDORSPECIFIC_INFO {
 	VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];
 	B_UINT32 Reserved[16];
 } FLASH2X_VENDORSPECIFIC_INFO, *PFLASH2X_VENDORSPECIFIC_INFO;
 
-typedef struct _DSD_HEADER
-{
+typedef struct _DSD_HEADER {
 	B_UINT32 DSDImageSize;
 	B_UINT32 DSDImageCRC;
 	B_UINT32 DSDImagePriority;
@@ -147,8 +141,7 @@ typedef struct _DSD_HEADER
 	B_UINT32 DSDImageMagicNumber;
 } DSD_HEADER, *PDSD_HEADER;
 
-typedef struct _ISO_HEADER
-{
+typedef struct _ISO_HEADER {
 	B_UINT32 ISOImageMagicNumber;
 	B_UINT32 ISOImageSize;
 	B_UINT32 ISOImageCRC;