---

yaml --- r: 67539 b: refs/heads/master c: dc9b43d h: refs/heads/master i: 67537: 8392c01 67535: a7587d7 v: v3
git-mirror · Oct 11, 2007 · d394b4b · d394b4b
1 parent 9d3846a
commit d394b4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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)
 {