projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9122ee3
)
[PATCH] powerpc: always init nvram on 64-bit powermac
author
David Woodhouse
<dwmw2@infradead.org>
Wed, 2 Nov 2005 16:54:46 +0000
(16:54 +0000)
committer
Paul 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
|
history
diff --git
a/arch/powerpc/platforms/powermac/setup.c
b/arch/powerpc/platforms/powermac/setup.c
index
d8bdaaf
..
80b58c1
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();
-#if
def CONFIG_NVRAM
+#if
defined(CONFIG_NVRAM) || defined(CONFIG_PPC64)
pmac_nvram_init();
#endif