From 70a52e31799a902c5c4de14e0c533b1ac7c905c9 Mon Sep 17 00:00:00 2001 From: Arvydas Sidorenko Date: Mon, 12 Sep 2011 17:16:39 +0200 Subject: [PATCH] --- yaml --- r: 268386 b: refs/heads/master c: d15cce50161bbb46236f9c50ab044c795cbbecc0 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/crystalhd/bc_dts_types.h | 57 ------------------- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/[refs] b/[refs] index 38d813e095e5..54d3d7f19fac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18e9351e453fbcf445cb8ffdd2e106e0212166da +refs/heads/master: d15cce50161bbb46236f9c50ab044c795cbbecc0 diff --git a/trunk/drivers/staging/crystalhd/bc_dts_types.h b/trunk/drivers/staging/crystalhd/bc_dts_types.h index d2131e7fe2fb..1085a91221b8 100644 --- a/trunk/drivers/staging/crystalhd/bc_dts_types.h +++ b/trunk/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 -