diff --git a/[refs] b/[refs] index 67a413eaf4d9..2bd2113884aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21814d6c455c7bc112dd0b0ca32756aa2ad81733 +refs/heads/master: 7730492855a2f9c828599bcd8d62760f96d319e4 diff --git a/trunk/drivers/staging/vt6656/ttype.h b/trunk/drivers/staging/vt6656/ttype.h index 0f70562c0563..dfbf74713a80 100644 --- a/trunk/drivers/staging/vt6656/ttype.h +++ b/trunk/drivers/staging/vt6656/ttype.h @@ -44,9 +44,9 @@ typedef int BOOL; /****** Simple typedefs ***************************************************/ -typedef unsigned char BYTE; // 8-bit -typedef unsigned short WORD; // 16-bit -typedef unsigned long DWORD; // 32-bit +typedef u8 BYTE; +typedef u16 WORD; +typedef u32 DWORD; // QWORD is for those situation that we want // an 8-byte-aligned 8 byte long structure @@ -62,8 +62,8 @@ typedef UQuadWord QWORD; // 64-bit /****** Common pointer types ***********************************************/ -typedef unsigned long ULONG_PTR; // 32-bit -typedef unsigned long DWORD_PTR; // 32-bit +typedef u32 ULONG_PTR; +typedef u32 DWORD_PTR; // boolean pointer