From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 23 Mar 2009 16:33:20 +0000 (-0700)
Subject: Staging: epl: remove NULL from global.h
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=335914e315103100dd27a648744fd2440d31075d;p=linux-beck.git

Staging: epl: remove NULL from global.h

Don't define something that is already defined in the kernel.

Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h
index 11b75e4ef6be..4eb64ecab0f3 100644
--- a/drivers/staging/epl/global.h
+++ b/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;