From 6ca7d8d65d640bb64bdfa22e4afc978f217b70fc Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 4 Jul 2006 14:07:42 +1000 Subject: [PATCH] --- yaml --- r: 32989 b: refs/heads/master c: 21bd2e6696bb5c8b32b00a0ea597f49bfda0ddc6 h: refs/heads/master i: 32987: 01caca94e773c39a5bf2f6a144583f8a72647181 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f8703d35c20c..b59fa4aa9d82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ca330bc4ce00377f940b786d7ec7d848dc4102 +refs/heads/master: 21bd2e6696bb5c8b32b00a0ea597f49bfda0ddc6 diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index b6c3ac20c14c..462bced40c12 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -557,7 +557,9 @@ unsigned long prom_memparse(const char *ptr, const char **retptr) static void __init early_cmdline_parse(void) { struct prom_t *_prom = &RELOC(prom); +#ifdef CONFIG_PPC64 const char *opt; +#endif char *p; int l = 0;