diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:46:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:46:43 -0400 |
| commit | 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6 (patch) | |
| tree | a64105f06bfdd583f2c58d225255769f50d18b62 | |
| parent | a3b5960ebd660c9ab92fce9a01d1905ff9b981cb (diff) | |
| parent | ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5 (diff) | |
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 62d8a99271e..38e569f786d 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
| @@ -297,7 +297,6 @@ EXPORT_SYMBOL(svr4_getcontext); | |||
| 297 | EXPORT_SYMBOL(svr4_setcontext); | 297 | EXPORT_SYMBOL(svr4_setcontext); |
| 298 | EXPORT_SYMBOL(compat_sys_ioctl); | 298 | EXPORT_SYMBOL(compat_sys_ioctl); |
| 299 | EXPORT_SYMBOL(sparc32_open); | 299 | EXPORT_SYMBOL(sparc32_open); |
| 300 | EXPORT_SYMBOL(sys_close); | ||
| 301 | #endif | 300 | #endif |
| 302 | 301 | ||
| 303 | /* Special internal versions of library functions. */ | 302 | /* Special internal versions of library functions. */ |