projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9122ee3)
[PATCH] powerpc: always init nvram on 64-bit powermac
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 2 Nov 2005 16:54:46 +0000 (16:54 +0000)
committerPaul Mackerras <paulus@samba.org>
Thu, 3 Nov 2005 05:56:13 +0000 (16:56 +1100)
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>
arch/powerpc/platforms/powermac/setup.c patch | blob | blame | history

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index d8bdaaf74c9b240f2b958c868588108257685d8a..80b58c1ec4120d8b43de70f081d77c2955d56a11 100644 (file)
--- 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