aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/ppc_ksyms.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-16 20:01:19 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-16 20:01:19 -0500
commit23dd64011285010ac291f7dddf6e287bdb43a0ad (patch)
tree0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /arch/powerpc/kernel/ppc_ksyms.c
parent516450179454de9e689e0a53ed8f34b896e8651c (diff)
parent485ff09990416c75ae9593ddc71619939ab9dd51 (diff)
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/ppc_ksyms.c')
-rw-r--r--arch/powerpc/kernel/ppc_ksyms.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index af32922db65b..dfa5398ab3c8 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -109,15 +109,6 @@ EXPORT_SYMBOL(_insw_ns);
109EXPORT_SYMBOL(_outsw_ns); 109EXPORT_SYMBOL(_outsw_ns);
110EXPORT_SYMBOL(_insl_ns); 110EXPORT_SYMBOL(_insl_ns);
111EXPORT_SYMBOL(_outsl_ns); 111EXPORT_SYMBOL(_outsl_ns);
112EXPORT_SYMBOL(ioremap);
113#ifdef CONFIG_44x
114EXPORT_SYMBOL(ioremap64);
115#endif
116EXPORT_SYMBOL(__ioremap);
117EXPORT_SYMBOL(iounmap);
118#ifdef CONFIG_PPC32
119EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
120#endif
121 112
122#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)) 113#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE))
123EXPORT_SYMBOL(ppc_ide_md); 114EXPORT_SYMBOL(ppc_ide_md);
@@ -160,7 +151,6 @@ EXPORT_SYMBOL(__flush_icache_range);
160EXPORT_SYMBOL(flush_dcache_range); 151EXPORT_SYMBOL(flush_dcache_range);
161 152
162#ifdef CONFIG_SMP 153#ifdef CONFIG_SMP
163EXPORT_SYMBOL(smp_call_function);
164#ifdef CONFIG_PPC32 154#ifdef CONFIG_PPC32
165EXPORT_SYMBOL(smp_hw_index); 155EXPORT_SYMBOL(smp_hw_index);
166#endif 156#endif