diff --git a/[refs] b/[refs]
index ed5ebeb5749a..07e2c6107e0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a8e29752dfdba014b866d3c587d3409e57263dd
+refs/heads/master: 88d43000098017d93d9bb2f88d33950e6c7a6bf4
diff --git a/trunk/drivers/staging/crystalhd/bc_dts_types.h b/trunk/drivers/staging/crystalhd/bc_dts_types.h
index e073d7450c16..ac0c81717385 100644
--- a/trunk/drivers/staging/crystalhd/bc_dts_types.h
+++ b/trunk/drivers/staging/crystalhd/bc_dts_types.h
@@ -25,6 +25,10 @@
 #ifndef _BC_DTS_TYPES_H_
 #define _BC_DTS_TYPES_H_
 
+#ifdef __LINUX_USER__  // Don't include these for KERNEL..
+#include <stdint.h>
+#endif
+
 #if defined(_WIN64) || defined(_WIN32)
 typedef uint32_t		U32;
 typedef int32_t			S32;
@@ -62,7 +66,9 @@ typedef int	BOOL;
 typedef uint32_t	ULONG;
 typedef int32_t		LONG;
 typedef void		*HANDLE;
+#ifndef VOID
 typedef void		VOID;
+#endif
 typedef void		*LPVOID;
 typedef uint32_t	DWORD;
 typedef uint32_t	UINT32;