diff --git a/drivers/staging/crystalhd/bc_dts_types.h b/drivers/staging/crystalhd/bc_dts_types.h index d2131e7fe2fb..1085a91221b8 100644 --- a/drivers/staging/crystalhd/bc_dts_types.h +++ b/drivers/staging/crystalhd/bc_dts_types.h @@ -25,32 +25,7 @@ #ifndef _BC_DTS_TYPES_H_ #define _BC_DTS_TYPES_H_ -#ifdef __LINUX_USER__ /* Don't include these for KERNEL.. */ #include -#endif - -#ifndef PVOID -typedef void *PVOID; -#endif - -#ifndef BOOL -typedef int BOOL; -#endif - -#if defined(__KERNEL__) || defined(__LINUX_USER__) - -#ifdef __LINUX_USER__ /* Don't include these for KERNEL */ -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; -typedef uint32_t *LPDWORD; -typedef unsigned char *PUCHAR; #ifndef TRUE #define TRUE 1 @@ -62,36 +37,4 @@ typedef unsigned char *PUCHAR; #define TEXT -#else - -/* For Kernel usage.. */ #endif - -#else - -#ifndef uint64_t -typedef struct _uint64_t { - uint32_t low_dw; - uint32_t hi_dw; -} uint64_t; -#endif - -#ifndef int32_t -typedef signed long int32_t; -#endif - -#ifndef uint32_t -typedef unsigned long uint32_t; -#endif - -#ifndef uint16_t -typedef unsigned short uint16_t; -#endif - -#ifndef uint8_t -typedef unsigned char uint8_t; -#endif -#endif - -#endif -