From 8fc27e0bda4fda15abc377e2bea04ab4fc0a8aff Mon Sep 17 00:00:00 2001
From: Robin Getz <rgetz@blackfin.uclinux.org>
Date: Tue, 28 Oct 2008 11:36:11 +0800
Subject: [PATCH] --- yaml --- r: 119135 b: refs/heads/master c:
 4ee1c45337e7b529eed644c6f62399d797dcbc10 h: refs/heads/master i:   119133:
 e61b8194558e4343b0874458b6e89bfacf8c3766   119131:
 438a83410f1fa9d7b752d34f1587818b37ddede0   119127:
 691c33cb9256cab283f8627f615d52a933954190   119119:
 fce92d5946bfc80571bd15e8e2d6dc4bdcb578ba   119103:
 73025b8ae0456cb31a04df6c857a210014dde73a v: v3

---
 [refs]                             | 2 +-
 trunk/arch/blackfin/kernel/traps.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c2abf323215b..4782a65a48c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b1f26a50a2bfbd2825345b49b1d7f78432a7a4c
+refs/heads/master: 4ee1c45337e7b529eed644c6f62399d797dcbc10
diff --git a/trunk/arch/blackfin/kernel/traps.c b/trunk/arch/blackfin/kernel/traps.c
index 0003616d02a2..bef025b07443 100644
--- a/trunk/arch/blackfin/kernel/traps.c
+++ b/trunk/arch/blackfin/kernel/traps.c
@@ -59,7 +59,7 @@
 #endif
 
 
-#ifdef CONFIG_VERBOSE_DEBUG
+#ifdef CONFIG_DEBUG_VERBOSE
 #define verbose_printk(fmt, arg...) \
 	printk(fmt, ##arg)
 #else
@@ -574,7 +574,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
 #endif
 			panic("Kernel exception");
 		} else {
-#ifdef CONFIG_VERBOSE_DEBUG
+#ifdef CONFIG_DEBUG_VERBOSE
 			unsigned long *stack;
 			/* Dump the user space stack */
 			stack = (unsigned long *)rdusp();