From d394b4b1318c027712bb0a013c3aa384300e9be7 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Wed, 10 Oct 2007 08:36:18 +1000
Subject: [PATCH] --- yaml --- r: 67539 b: refs/heads/master c:
 dc9b43d0f706852fc4abce5bf28958db41524328 h: refs/heads/master i:   67537:
 8392c01435ee14007a586689c23a9a047e19c623   67535:
 a7587d744c4f3d96f4e561bbb1bb5aac52e2a007 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/vdso.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 821a5f9ee81c..8a1c3e659479 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b45b10f1425d02819b525e3805ddacd9ad4f29
+refs/heads/master: dc9b43d0f706852fc4abce5bf28958db41524328
diff --git a/trunk/arch/powerpc/kernel/vdso.c b/trunk/arch/powerpc/kernel/vdso.c
index 213fa31ac537..2322ba5cce4c 100644
--- a/trunk/arch/powerpc/kernel/vdso.c
+++ b/trunk/arch/powerpc/kernel/vdso.c
@@ -766,7 +766,9 @@ static int __init vdso_init(void)
 
 	return 0;
 }
+#ifdef CONFIG_PPC_MERGE
 arch_initcall(vdso_init);
+#endif
 
 int in_gate_area_no_task(unsigned long addr)
 {