diff --git a/[refs] b/[refs] index e6f1ce9aa634..e5042d128f5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4a4d56898aac07ac98488c1bc3193fe4f2e126d +refs/heads/master: 335914e315103100dd27a648744fd2440d31075d diff --git a/trunk/drivers/staging/epl/global.h b/trunk/drivers/staging/epl/global.h index 11b75e4ef6be..4eb64ecab0f3 100644 --- a/trunk/drivers/staging/epl/global.h +++ b/trunk/drivers/staging/epl/global.h @@ -222,9 +222,6 @@ #ifndef FALSE #define FALSE 0x00 #endif -#ifndef NULL -#define NULL ((void *) 0) -#endif #ifndef _TIME_OF_DAY_DEFINED_ typedef struct { unsigned long int m_dwMs;