From a9b5ff015c7ef472041e36ba8c52166e1216d2cc Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 23 Mar 2009 09:33:20 -0700
Subject: [PATCH] --- yaml --- r: 141711 b: refs/heads/master c:
 335914e315103100dd27a648744fd2440d31075d h: refs/heads/master i:   141709:
 61732b5f60fb545588673af87cb8b6b998cf2ab8   141707:
 844a60cbf2c9b8ec9b6dd10b4704097a257a88a8   141703:
 51dff6f848f70117ebccdfbc136f92a648f9144f   141695:
 0b9502b07915d0f484f3fa551f1b1d8dfe779c29 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/epl/global.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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;