commit 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6
author Linus Torvalds <torvalds@g5.osdl.org> Mon Jun 12 13:46:43 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Jun 12 13:46:43 2006 -0700
tree a64105f06bfdd583f2c58d225255769f50d18b62
parent a3b5960ebd660c9ab92fce9a01d1905ff9b981cb
parent ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Do not double-export sys_close() when CONFIG_SOLARIS_EMUL_MODULE

arch/sparc64/kernel/sparc64_ksyms.c

diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 62d8a99..38e569f 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -297,7 +297,6 @@
 EXPORT_SYMBOL(svr4_setcontext);
 EXPORT_SYMBOL(compat_sys_ioctl);
 EXPORT_SYMBOL(sparc32_open);
-EXPORT_SYMBOL(sys_close);
 #endif
 
 /* Special internal versions of library functions. */