diff --git a/[refs] b/[refs]
index 1c2414387acd..c31e039d1f72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e341d3ddb1eec46f7164a7a895149c671d10f5
+refs/heads/master: 3712af0c0d6889408c17138671814ab315ff53ce
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 5b407d66e1df..2f03c0de6971 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -1262,7 +1262,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 	case IOCTL_BCM_NVM_READ:
 	case IOCTL_BCM_NVM_WRITE: {
-		NVM_READWRITE  stNVMReadWrite;
+		struct bcm_nvm_readwrite stNVMReadWrite;
 		PUCHAR pReadData = NULL;
 		ULONG ulDSDMagicNumInUsrBuff = 0;
 		struct timeval tv0, tv1;
@@ -1289,7 +1289,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 		if (copy_from_user(&stNVMReadWrite,
 					(IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
-					sizeof(NVM_READWRITE)))
+					sizeof(struct bcm_nvm_readwrite)))
 			return -EFAULT;
 
 		/*
@@ -1842,7 +1842,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	break;
 
 	case IOCTL_BCM_NVM_RAW_READ: {
-		NVM_READWRITE stNVMRead;
+		struct bcm_nvm_readwrite stNVMRead;
 		INT NOB ;
 		INT BuffSize ;
 		INT ReadOffset = 0;
@@ -1861,7 +1861,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EFAULT;
 		}
 
-		if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(NVM_READWRITE)))
+		if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(struct bcm_nvm_readwrite)))
 			return -EFAULT;
 
 		NOB = stNVMRead.uiNumBytes;
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index 4a32e8f251eb..ec51c8bc7e79 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -116,12 +116,12 @@ typedef struct _DEVICE_DRIVER_INFO {
 	unsigned int		u32Reserved[10];
 } DEVICE_DRIVER_INFO;
 
-typedef  struct _NVM_READWRITE {
+struct bcm_nvm_readwrite {
 	void __user *pBuffer;
 	uint32_t  uiOffset;
 	uint32_t uiNumBytes;
 	bool bVerify;
-} NVM_READWRITE, *PNVM_READWRITE;
+};
 
 struct bcm_bulk_wrm_buffer {
 	unsigned long Register;