diff --git a/[refs] b/[refs]
index 7ea0cddc8bee..ca5d5223d7bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7c38309e4709b4cce4b9c6373e7f1dd7d2d8c8c
+refs/heads/master: e6cc5eac8a823fb9674f46cd5050d607009b4a72
diff --git a/trunk/drivers/staging/epl/global.h b/trunk/drivers/staging/epl/global.h
index ba5cf3201bdf..31ea536e48b9 100644
--- a/trunk/drivers/staging/epl/global.h
+++ b/trunk/drivers/staging/epl/global.h
@@ -33,25 +33,7 @@
 
 #define TRACE  printk
 
-#ifndef SHORT
-#define SHORT short int
-#endif
-#ifndef USHORT
-#define USHORT unsigned short int
-#endif
-#ifndef INT
-#define INT int
-#endif
-#ifndef UINT
-#define UINT unsigned int
-#endif
-#ifndef LONG
-#define LONG long int
-#endif
-#ifndef ULONG
-#define ULONG unsigned long int
-#endif
-    // --- logic types ---
+// --- logic types ---
 #ifndef BYTE
 #define BYTE unsigned char
 #endif
@@ -64,7 +46,8 @@
 #ifndef BOOL
 #define BOOL unsigned char
 #endif
-    // --- alias types ---
+
+// --- alias types ---
 #ifndef TRUE
 #define TRUE  0xFF
 #endif