[patch] fix RTC/NVRAM accesses on Maple

Paul Mackerras paulus at samba.org
Fri May 19 08:58:10 EST 2006


Hollis Blanchard writes:

> This patch adds ifdefs mid-file, but some were already present anyways,
> and I don't see a better way.

It would look better as:

#ifdef CONFIG_PPC_MAPLE
/* PIBS Version 1.05.0000 04/26/2005 has an incorrect /ht/isa/ranges property.
 * The values are bad, and it doesn't even have the right number of cells. */
static void __init fixup_device_tree_maple(void)
{
	... etc ...
}
#else
#define fixup_device_tree_maple()
#endif

#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)
static void __init fixup_device_tree_pmac(void)
{
	... etc ...
}
#else
#define fixup_device_tree_pmac()
#endif

static void __init fixup_device_tree(void)
{
	fixup_device_tree_maple();
	fixup_device_tree_pmac();
}

Care to redo the patch?

Thanks,
Paul.



More information about the Linuxppc-dev mailing list