From b889ac973f1b66f7b91f42c65bc42bfd57c61a21 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 26 Feb 2009 15:37:08 -0800
Subject: [PATCH] --- yaml --- r: 141101 b: refs/heads/master c:
 8665b184749dbb3b55313e60e27ff93296f95d18 h: refs/heads/master i:   141099:
 d7bf73b94d5985ea6898b0737b91c9297c0296e5 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/slicoss/slicdbg.h | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index c771cd88da0d..270b3b01b5d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bee4f60344a880e7174a38051f6dede4f528b47
+refs/heads/master: 8665b184749dbb3b55313e60e27ff93296f95d18
diff --git a/trunk/drivers/staging/slicoss/slicdbg.h b/trunk/drivers/staging/slicoss/slicdbg.h
index b5643ced74fe..cafe8b67de4d 100644
--- a/trunk/drivers/staging/slicoss/slicdbg.h
+++ b/trunk/drivers/staging/slicoss/slicdbg.h
@@ -57,24 +57,10 @@
 	}                                                                 \
     }
 #endif
-#ifndef ASSERTMSG
-#define ASSERTMSG(a,msg)                                                  \
-    {                                                                     \
-	if (!(a)) {                                                       \
-		printk(KERN_ERR "ASSERT() Failure: file %s, function %s" \
-			"line %d: %s\n",\
-			__FILE__, __func__, __LINE__, (msg));            \
-		slic_assert_fail();                                      \
-	}                                                                \
-    }
-#endif
 #else
 #ifndef ASSERT
 #define ASSERT(a)
 #endif
-#ifndef ASSERTMSG
-#define ASSERTMSG(a, msg)
-#endif
 #endif /* SLIC_ASSERT_ENABLED  */
 
 #endif  /*  _SLIC_DEBUG_H_  */