From 079f466cd2a28719bd31dc9c115b55a40991786c Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Wed, 11 Jan 2006 15:30:07 +1100
Subject: [PATCH] --- yaml --- r: 17863 b: refs/heads/master c:
 6bac953fa424519f784ba2589fefd8f040ce54f0 h: refs/heads/master i:   17861:
 f58cfa7f5b9795c1ec61f6403350c935a5b2fa4c   17859:
 b7e77d24f001b9cb415a8527bed2d8ffad4216a6   17855:
 ac0799b1fead2984e823b66766fc67a68961f8d0 v: v3

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

diff --git a/[refs] b/[refs]
index 6ceb7fe5c1d9..0b5b0a67bcfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 415c2e083a85f0daf6cbb4988691ac3ea9279509
+refs/heads/master: 6bac953fa424519f784ba2589fefd8f040ce54f0
diff --git a/trunk/arch/powerpc/kernel/crash_dump.c b/trunk/arch/powerpc/kernel/crash_dump.c
index 87effa3f21a7..211d72653ea6 100644
--- a/trunk/arch/powerpc/kernel/crash_dump.c
+++ b/trunk/arch/powerpc/kernel/crash_dump.c
@@ -55,6 +55,7 @@ void __init kdump_setup(void)
 	DBG(" <- kdump_setup()\n");
 }
 
+#ifdef CONFIG_PROC_VMCORE
 static int __init parse_elfcorehdr(char *p)
 {
 	if (p)
@@ -63,6 +64,7 @@ static int __init parse_elfcorehdr(char *p)
 	return 0;
 }
 __setup("elfcorehdr=", parse_elfcorehdr);
+#endif
 
 static int __init parse_savemaxmem(char *p)
 {