diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-13 13:28:00 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-13 13:28:00 +1100 |
| commit | fe6af6faec078ec8137631f24cb541f9918244f0 (patch) | |
| tree | a0982a904578f0f6ea0bc4113e9de6bbfbe45e43 /arch/ppc | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| download | op-kernel-dev-fe6af6faec078ec8137631f24cb541f9918244f0.zip op-kernel-dev-fe6af6faec078ec8137631f24cb541f9918244f0.tar.gz | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 2 | ||||
| -rw-r--r-- | arch/ppc/mm/pgtable.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 1f49503..1318b6f 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c @@ -271,7 +271,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ extern long *intercept_table; EXPORT_SYMBOL(intercept_table); #endif /* CONFIG_PPC_STD_MMU */ -#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) +#ifdef CONFIG_PPC_DCR_NATIVE EXPORT_SYMBOL(__mtdcr); EXPORT_SYMBOL(__mfdcr); #endif diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c index 82b06a1..c023b72 100644 --- a/arch/ppc/mm/pgtable.c +++ b/arch/ppc/mm/pgtable.c @@ -314,7 +314,7 @@ void __init mapin_ram(void) } /* is x a power of 4? */ -#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)) +#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1) /* * Set up a mapping for a block of I/O. |
