---

yaml --- r: 141099 b: refs/heads/master c: e5bac59 h: refs/heads/master i: 141097: 0e5deed 141095: f6fcd7f v: v3
git-mirror · Apr 3, 2009 · d7bf73b · d7bf73b
1 parent ebbb091
commit d7bf73b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e52011e4761938632a926e8518834a8f66918f26
+refs/heads/master: e5bac59803550c490f292391f7877107fd24107a
diff --git a/trunk/drivers/staging/slicoss/slicdbg.h b/trunk/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 --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
@@ -4042,7 +4042,8 @@ static int __init slic_module_init(void)
 	slic_init_driver();
 
 	if (debug >= 0 && slic_debug != debug)
-		printk(SLICLEVEL "slicoss: debug level is %d.\n", debug);
+		printk(KERN_DEBUG KBUILD_MODNAME ": debug level is %d.\n",
+		       debug);
 	if (debug >= 0)
 		slic_debug = debug;