Staging: slicoss: remove SLICLEVEL and SLIC_DISPLAY macros

They aren't needed or used anymore.

Cc: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/slicoss/slicdbg.h b/drivers/staging/slicoss/slicdbg.h
index 6298a5a..12a91d7 100644 (file)
--- a/drivers/staging/slicoss/slicdbg.h
+++ b/drivers/staging/slicoss/slicdbg.h
@@ -42,12 +42,7 @@
 #ifndef _SLIC_DEBUG_H_
 #define _SLIC_DEBUG_H_
 
-#ifdef SLIC_DEFAULT_LOG_LEVEL
-#else
-#define SLICLEVEL   KERN_DEBUG
-#endif
-#define SLIC_DISPLAY              printk
-#define DBG_ERROR(n, args...)   SLIC_DISPLAY(KERN_EMERG n, ##args)
+#define DBG_ERROR(n, args...)  printk(KERN_EMERG n, ##args)
 
 #ifdef ASSERT
 #undef ASSERT

diff --cc drivers/staging/slicoss/slicoss.c
Simple merge