From 3c7b838366cec4e56d76f745c91934671479d770 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 4 Jul 2012 15:51:10 +1000
Subject: [PATCH] --- yaml --- r: 311757 b: refs/heads/master c:
 50fb31cfed9218b439360caf7c0399b00042da15 h: refs/heads/master i:   311755:
 6e1bf32997bc86574b052b8906cbc6f6daf1d8d9 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/tty/hvc/hvc_opal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7d4fe918b99c..69fb26afb936 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa709f3bc92c6daaf177cd7e3446da2ef64426c6
+refs/heads/master: 50fb31cfed9218b439360caf7c0399b00042da15
diff --git a/trunk/drivers/tty/hvc/hvc_opal.c b/trunk/drivers/tty/hvc/hvc_opal.c
index ced26c8ccd57..0d2ea0c224c3 100644
--- a/trunk/drivers/tty/hvc/hvc_opal.c
+++ b/trunk/drivers/tty/hvc/hvc_opal.c
@@ -401,7 +401,7 @@ void __init hvc_opal_init_early(void)
 }
 
 #ifdef CONFIG_PPC_EARLY_DEBUG_OPAL_RAW
-void __init udbg_init_debug_opal(void)
+void __init udbg_init_debug_opal_raw(void)
 {
 	u32 index = CONFIG_PPC_EARLY_DEBUG_OPAL_VTERMNO;
 	hvc_opal_privs[index] = &hvc_opal_boot_priv;