aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-04-22 19:19:06 +1000
committerPaul Mackerras <paulus@samba.org>2006-04-22 19:19:06 +1000
commit7c8ce71b092425f1e938285cab2a679c09444d9b (patch)
treedc4365d2fcbe1e373ee8b1f7a5ccca54cffb6fc9
parent[PATCH] powerpc: fix oops in alsa powermac driver (diff)
parentMerge branch 'master' (diff)
downloadlinux-dev-7c8ce71b092425f1e938285cab2a679c09444d9b.tar.xz
linux-dev-7c8ce71b092425f1e938285cab2a679c09444d9b.zip
Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
-rw-r--r--arch/powerpc/kernel/ppc_ksyms.c1
-rw-r--r--arch/ppc/kernel/ppc_ksyms.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index dfa5398ab3c8..4b052ae5dc34 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -81,6 +81,7 @@ EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strlen);
EXPORT_SYMBOL(strcmp);
EXPORT_SYMBOL(strcasecmp);
+EXPORT_SYMBOL(strncasecmp);
EXPORT_SYMBOL(csum_partial);
EXPORT_SYMBOL(csum_partial_copy_generic);
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 865ba74991a9..b250b1b539b6 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -94,6 +94,7 @@ EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strlen);
EXPORT_SYMBOL(strcmp);
EXPORT_SYMBOL(strcasecmp);
+EXPORT_SYMBOL(strncasecmp);
EXPORT_SYMBOL(__div64_32);
EXPORT_SYMBOL(csum_partial);