diff options
| author |   David Woodhouse <dwmw2@infradead.org> | 2005-11-02 16:54:46 +0000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-11-03 16:56:13 +1100 |
| commit | 91c33d28cda0d3ee1df0cdf399610dbb4e846a45 (patch) | |
| tree | 9be3172ec876a9698e2fa8bd0356bc104213fdaa | |
| parent | [PATCH] ppc: Fix build warnings in arch/ppc/kernel/traps.c (diff) | |
| download | linux-dev-91c33d28cda0d3ee1df0cdf399610dbb4e846a45.tar.xz linux-dev-91c33d28cda0d3ee1df0cdf399610dbb4e846a45.zip | |
[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>
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index d8bdaaf74c9b..80b58c1ec412 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 |