From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 2 Nov 2005 16:54:46 +0000 (+0000)
Subject: [PATCH] powerpc: always init nvram on 64-bit powermac
X-Git-Tag: v2.6.15-rc1~726^2~3^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=91c33d28cda0d3ee1df0cdf399610dbb4e846a45;p=linux-2.6-omap-h63xx.git

[PATCH] powerpc: always init nvram on 64-bit powermac

Currently there is no Kconfig symbol to indicate that we want nvram
support on 64-bit kernels; it's assumed we always want it, so make
the powermac setup code always initialize the pmac nvram code if
64-bit.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index d8bdaaf74c9..80b58c1ec41 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -351,7 +351,7 @@ void __init pmac_setup_arch(void)
 	find_via_pmu();
 	smu_init();
 
-#ifdef CONFIG_NVRAM
+#if defined(CONFIG_NVRAM) || defined(CONFIG_PPC64)
 	pmac_nvram_init();
 #endif