This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / src / console / printk.c

diff --git a/src/console/printk.c b/src/console/printk.c
index 636424c12a764c9925ad7807e0e35521c33c39c1..0485a001da37bea1ba45e388a76bb5e030570005 100644 (file)
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -4,7 +4,6 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *
  */
-//typedef void * va_list;
 
 #include <stdarg.h>
 #include <smp/spinlock.h>
@@ -18,15 +17,15 @@
 
 /* Keep together for sysctl support */
 
-int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
+int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
 int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL;
 int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL;
-int default_console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
+int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
 
 void display(char*);
 extern int vtxprintf(void (*)(unsigned char), const char *, va_list);
 
-spinlock_t console_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t console_lock = SPIN_LOCK_UNLOCKED;
 
 int do_printk(int msg_level, const char *fmt, ...)
 {