From: David S. Miller Date: Mon, 29 Oct 2007 08:19:14 +0000 (-0700) Subject: [SPARC64]: Fix build with CONFIG_NET disabled. X-Git-Tag: v2.6.24-rc2~59 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6898556e90ba9842e59ac9c2425b42ea33019b4;p=linux-2.6-omap-h63xx.git [SPARC64]: Fix build with CONFIG_NET disabled. We can't export verify_compat_iovec when CONFIG_NET is disabled, and consequently the Solaris compat module should also depend upon CONFIG_NET. Signed-off-by: David S. Miller --- diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index bd59ab0760b..10b212a1f9f 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -408,7 +408,7 @@ config SUNOS_EMUL config SOLARIS_EMUL tristate "Solaris binary emulation (EXPERIMENTAL)" - depends on SPARC32_COMPAT && EXPERIMENTAL + depends on SPARC32_COMPAT && NET && EXPERIMENTAL help This is experimental code which will enable you to run (many) Solaris binaries on your SPARC Linux machine. diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 23fad7ebdd0..60765e314bd 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c @@ -221,7 +221,7 @@ EXPORT_SYMBOL(pci_dma_supported); /* I/O device mmaping on Sparc64. */ EXPORT_SYMBOL(io_remap_pfn_range); -#ifdef CONFIG_COMPAT +#if defined(CONFIG_COMPAT) && defined(CONFIG_NET) /* Solaris/SunOS binary compatibility */ EXPORT_SYMBOL(verify_compat_iovec); #endif