diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 13:46:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 13:46:43 -0700 |
| commit | 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6 (patch) | |
| tree | a64105f06bfdd583f2c58d225255769f50d18b62 | |
| parent | a3b5960ebd660c9ab92fce9a01d1905ff9b981cb (diff) | |
| parent | ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5 (diff) | |
| download | linux-5f856e8bdcf5936c9c13cb251dae770e6eeb06b6.tar.bz2 | |
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
| -rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 62d8a99271ea..38e569f786dd 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c @@ -297,7 +297,6 @@ EXPORT_SYMBOL(svr4_getcontext); EXPORT_SYMBOL(svr4_setcontext); EXPORT_SYMBOL(compat_sys_ioctl); EXPORT_SYMBOL(sparc32_open); -EXPORT_SYMBOL(sys_close); #endif /* Special internal versions of library functions. */ |