diff --git a/[refs] b/[refs]
index 5557e5bd10e3..c992abfb726e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5ec04ed75a5ffee36611aac58936f33db41ba92
+refs/heads/master: 20a2ae8019080d6641fb409016b55e48e6773dcc
diff --git a/trunk/drivers/staging/bcm/nvm.h b/trunk/drivers/staging/bcm/nvm.h
index 9a45df15e573..7aed26376d1b 100644
--- a/trunk/drivers/staging/bcm/nvm.h
+++ b/trunk/drivers/staging/bcm/nvm.h
@@ -285,7 +285,7 @@ typedef struct _ISO_HEADER {
 #define SIGNATURE_SIZE			4
 #define DEFAULT_BUFF_SIZE		0x10000
 
-#define FIELD_OFFSET_IN_HEADER(HeaderPointer, Field) ((PUCHAR)&((HeaderPointer)(NULL))->Field - (PUCHAR)(NULL))
+#define FIELD_OFFSET_IN_HEADER(HeaderPointer, Field) ((u8 *)&((HeaderPointer)(NULL))->Field - (u8 *)(NULL))
 
 #endif