From 3568855605338bfec23f2add3b4b4475c86d5e4b Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Fri, 17 Jun 2011 03:10:06 +0000 Subject: [PATCH] --- yaml --- r: 259125 b: refs/heads/master c: e48f7eb27f0e38e1a461fa4e43025d18100d250b h: refs/heads/master i: 259123: 4ae00dab2816b2ab10c1d071b3a48ec08342f226 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/misc_64.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c3bf00e21cc2..e2116fcaaee4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d41e0f6d91cedcab08dff2f5e148b20c87a7432 +refs/heads/master: e48f7eb27f0e38e1a461fa4e43025d18100d250b diff --git a/trunk/arch/powerpc/kernel/misc_64.S b/trunk/arch/powerpc/kernel/misc_64.S index e89df59cdc5a..616921ef1439 100644 --- a/trunk/arch/powerpc/kernel/misc_64.S +++ b/trunk/arch/powerpc/kernel/misc_64.S @@ -339,7 +339,7 @@ _GLOBAL(real_205_writeb) #endif /* CONFIG_PPC_PASEMI */ -#ifdef CONFIG_CPU_FREQ_PMAC64 +#if defined(CONFIG_CPU_FREQ_PMAC64) || defined(CONFIG_CPU_FREQ_MAPLE) /* * SCOM access functions for 970 (FX only for now) * @@ -408,7 +408,7 @@ _GLOBAL(scom970_write) /* restore interrupts */ mtmsrd r5,1 blr -#endif /* CONFIG_CPU_FREQ_PMAC64 */ +#endif /* CONFIG_CPU_FREQ_PMAC64 || CONFIG_CPU_FREQ_MAPLE */ /*