diff options
author | David S. Miller <davem@bnsf.davemloft.net> | 2007-10-29 04:19:14 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-31 18:30:54 -0400 |
commit | d6898556e90ba9842e59ac9c2425b42ea33019b4 (patch) | |
tree | f0a6061a00747d60bc6509a5a8a9bb8f44bed1f9 | |
parent | 7e5766fa9431602ef0e56ceae900d0cce3a78b96 (diff) |
[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 <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/Kconfig | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index bd59ab0760b3..10b212a1f9f5 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -408,7 +408,7 @@ config SUNOS_EMUL | |||
408 | 408 | ||
409 | config SOLARIS_EMUL | 409 | config SOLARIS_EMUL |
410 | tristate "Solaris binary emulation (EXPERIMENTAL)" | 410 | tristate "Solaris binary emulation (EXPERIMENTAL)" |
411 | depends on SPARC32_COMPAT && EXPERIMENTAL | 411 | depends on SPARC32_COMPAT && NET && EXPERIMENTAL |
412 | help | 412 | help |
413 | This is experimental code which will enable you to run (many) | 413 | This is experimental code which will enable you to run (many) |
414 | Solaris binaries on your SPARC Linux machine. | 414 | Solaris binaries on your SPARC Linux machine. |
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 23fad7ebdd0d..60765e314bd8 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
@@ -221,7 +221,7 @@ EXPORT_SYMBOL(pci_dma_supported); | |||
221 | /* I/O device mmaping on Sparc64. */ | 221 | /* I/O device mmaping on Sparc64. */ |
222 | EXPORT_SYMBOL(io_remap_pfn_range); | 222 | EXPORT_SYMBOL(io_remap_pfn_range); |
223 | 223 | ||
224 | #ifdef CONFIG_COMPAT | 224 | #if defined(CONFIG_COMPAT) && defined(CONFIG_NET) |
225 | /* Solaris/SunOS binary compatibility */ | 225 | /* Solaris/SunOS binary compatibility */ |
226 | EXPORT_SYMBOL(verify_compat_iovec); | 226 | EXPORT_SYMBOL(verify_compat_iovec); |
227 | #endif | 227 | #endif |