diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-12 21:28:00 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-12 21:28:00 -0500 |
| commit | fe6af6faec078ec8137631f24cb541f9918244f0 (patch) | |
| tree | a0982a904578f0f6ea0bc4113e9de6bbfbe45e43 /arch/ppc/kernel | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 1f49503317cb..1318b6f4c3df 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 */ | |||
| 271 | extern long *intercept_table; | 271 | extern long *intercept_table; |
| 272 | EXPORT_SYMBOL(intercept_table); | 272 | EXPORT_SYMBOL(intercept_table); |
| 273 | #endif /* CONFIG_PPC_STD_MMU */ | 273 | #endif /* CONFIG_PPC_STD_MMU */ |
| 274 | #if defined(CONFIG_40x) || defined(CONFIG_BOOKE) | 274 | #ifdef CONFIG_PPC_DCR_NATIVE |
| 275 | EXPORT_SYMBOL(__mtdcr); | 275 | EXPORT_SYMBOL(__mtdcr); |
| 276 | EXPORT_SYMBOL(__mfdcr); | 276 | EXPORT_SYMBOL(__mfdcr); |
| 277 | #endif | 277 | #endif |