diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
tree | 189969a3689b9b83eaf39314a7942cc781ff836b /arch/ppc/kernel/ppc_ksyms.c | |
parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/ppc/kernel/ppc_ksyms.c')
-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 |