From cfbd5f7b14d8f725100ac8aba22dfb98b4dac0bf Mon Sep 17 00:00:00 2001
From: Malcolm Parsons <malcolm.parsons@gmail.com>
Date: Sat, 25 Mar 2006 21:58:03 +0000
Subject: [PATCH] --- yaml --- r: 24007 b: refs/heads/master c:
 3ee357f0f38a5fddebab18500c290d3879a2d89c h: refs/heads/master i:   24005:
 f7a2fb4a8973075c9ccfb1a334d4ddd997872317   24003:
 b2089503f8be47b84ddd421b1fac2e73a8085e93   23999:
 dceb140caeb3c8e9aa4dfba92bc05e8ddf53cbaa v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/lib/backtrace.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c79c8460ec3f..4887bd7be20f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80ed354725825035616fb369a8c38ff77494695c
+refs/heads/master: 3ee357f0f38a5fddebab18500c290d3879a2d89c
diff --git a/trunk/arch/arm/lib/backtrace.S b/trunk/arch/arm/lib/backtrace.S
index 68a21c0f3f52..3bdc8c6949c5 100644
--- a/trunk/arch/arm/lib/backtrace.S
+++ b/trunk/arch/arm/lib/backtrace.S
@@ -29,7 +29,7 @@ ENTRY(__backtrace)
 
 ENTRY(c_backtrace)
 
-#ifndef CONFIG_FRAME_POINTER
+#if !defined(CONFIG_FRAME_POINTER) || !defined(CONFIG_PRINTK)
 		mov	pc, lr
 #else