From c48b3a8da6fb1f030369224ecd85e733f8c17caf Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 23 Mar 2009 12:10:47 -0700
Subject: [PATCH] --- yaml --- r: 141723 b: refs/heads/master c:
 b852ba7d38a210b2d23c514f191582033b371e89 h: refs/heads/master i:   141721:
 5cf345104b16e05671bc912a96c635708aca0035   141719:
 849c170e3fe4848aa40e5313a39feffafe6c6c95 v: v3

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

diff --git a/[refs] b/[refs]
index 63571908f8ef..41473cb489b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e9f6bc67d44c7b73208d4038b8a637ff942ca52
+refs/heads/master: b852ba7d38a210b2d23c514f191582033b371e89
diff --git a/trunk/drivers/staging/epl/EplInstDef.h b/trunk/drivers/staging/epl/EplInstDef.h
index 5b7be34c14b8..756ac635324a 100644
--- a/trunk/drivers/staging/epl/EplInstDef.h
+++ b/trunk/drivers/staging/epl/EplInstDef.h
@@ -355,18 +355,6 @@ typedef BYTE tEplInstanceHdl;
 
 #endif
 
-/*
-#if (CDRV_MAX_INSTANCES > 1)
-
-    #define CDRV_REENTRANT                          REENTRANT
-
-#else
-
-    #define CDRV_REENTRANT
-
-#endif
-*/
-
 #endif // _EPLINSTDEF_H_
 
 // Die letzte Zeile muß unbedingt eine leere Zeile sein, weil manche Compiler
diff --git a/trunk/drivers/staging/epl/global.h b/trunk/drivers/staging/epl/global.h
index 74db85ce36c9..ba5cf3201bdf 100644
--- a/trunk/drivers/staging/epl/global.h
+++ b/trunk/drivers/staging/epl/global.h
@@ -31,8 +31,6 @@
 #define CONST const		// variables mapped to ROM (i.e. flash)
 #endif
 
-#define REENTRANT
-
 #define TRACE  printk
 
 #ifndef SHORT