diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-12-11 00:16:08 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-12-11 00:16:08 -0500 |
| commit | c86c676cca5be7366570ecf3d2e4f8e28cf2b920 (patch) | |
| tree | d97757920f4f84085151f71d158dce2891f8223a /arch/powerpc/kernel | |
| parent | a147c5857c0b591b05d787e59b691c3a4f245f83 (diff) | |
| parent | 45d8e7aaf47668550fdb6c2d3abbe42f48a76df2 (diff) | |
Merge branch '85xx' into for_paulus
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 9179f0739ea..95776b6af4e 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
| @@ -208,7 +208,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ | |||
| 208 | extern long *intercept_table; | 208 | extern long *intercept_table; |
| 209 | EXPORT_SYMBOL(intercept_table); | 209 | EXPORT_SYMBOL(intercept_table); |
| 210 | #endif /* CONFIG_PPC_STD_MMU_32 */ | 210 | #endif /* CONFIG_PPC_STD_MMU_32 */ |
| 211 | #if defined(CONFIG_40x) || defined(CONFIG_BOOKE) | 211 | #ifdef CONFIG_PPC_DCR_NATIVE |
| 212 | EXPORT_SYMBOL(__mtdcr); | 212 | EXPORT_SYMBOL(__mtdcr); |
| 213 | EXPORT_SYMBOL(__mfdcr); | 213 | EXPORT_SYMBOL(__mfdcr); |
| 214 | #endif | 214 | #endif |