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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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. */