Re: please pull the powerpc-merge.git tree
From: David Woodhouse <dwmw2@infradead.org>
Date: 2005-11-02 16:54:46
From: David Woodhouse <dwmw2@infradead.org>
Date: 2005-11-02 16:54:46
On Wed, 2005-11-02 at 15:43 +1100, Paul Mackerras wrote:
Those errors were all due to getting powerbook sleep code included because you have CONFIG_PM=y. I have changed things so that that code doesn't get included on a 64-bit build (at least until BenH gets sleep going on the G5 :).
OK, now the Fedora rawhide kernel builds for ppc64 with arch/powerpc and runs on both my POWER5 and G5 test boxes. I need this if I want nvram support on the G5 though. Should we be using CONFIG_GENERIC_NVRAM on ppc64, and actually allowing the nvram support to be optional?
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c@@ -351,7 +350,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
--
dwmw2