diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-12-01 15:16:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:13:17 -0500 |
| commit | b00296fb781acfafa93687000cdef72b8922bb40 (patch) | |
| tree | 5efd31cbfd4457f875e3f0a6becc864e643d7d03 | |
| parent | 54d67ee22c1ed12ff595defdf89e3d07b430497d (diff) | |
uml: add !UML dependencies
The previous commit ("uml: keep UML Kconfig in sync with x86") is not
enough, unfortunately. If we go that way, we need to add dependencies
on !UML for several options.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/Kconfig.instrumentation | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 5fd6688a444a..ddd3a259cea1 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -12,7 +12,7 @@ if CRYPTO_HW | |||
| 12 | 12 | ||
| 13 | config CRYPTO_DEV_PADLOCK | 13 | config CRYPTO_DEV_PADLOCK |
| 14 | tristate "Support for VIA PadLock ACE" | 14 | tristate "Support for VIA PadLock ACE" |
| 15 | depends on X86_32 | 15 | depends on X86_32 && !UML |
| 16 | select CRYPTO_ALGAPI | 16 | select CRYPTO_ALGAPI |
| 17 | help | 17 | help |
| 18 | Some VIA processors come with an integrated crypto engine | 18 | Some VIA processors come with an integrated crypto engine |
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation index f5f2c769d95e..2ea1e347df45 100644 --- a/kernel/Kconfig.instrumentation +++ b/kernel/Kconfig.instrumentation | |||
| @@ -21,7 +21,7 @@ config PROFILING | |||
| 21 | config OPROFILE | 21 | config OPROFILE |
| 22 | tristate "OProfile system profiling (EXPERIMENTAL)" | 22 | tristate "OProfile system profiling (EXPERIMENTAL)" |
| 23 | depends on PROFILING | 23 | depends on PROFILING |
| 24 | depends on ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64 | 24 | depends on (ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML |
| 25 | help | 25 | help |
| 26 | OProfile is a profiling system capable of profiling the | 26 | OProfile is a profiling system capable of profiling the |
| 27 | whole system, include the kernel, kernel modules, libraries, | 27 | whole system, include the kernel, kernel modules, libraries, |
| @@ -32,7 +32,7 @@ config OPROFILE | |||
| 32 | config KPROBES | 32 | config KPROBES |
| 33 | bool "Kprobes" | 33 | bool "Kprobes" |
| 34 | depends on KALLSYMS && MODULES | 34 | depends on KALLSYMS && MODULES |
| 35 | depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 | 35 | depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML |
| 36 | help | 36 | help |
| 37 | Kprobes allows you to trap at almost any kernel address and | 37 | Kprobes allows you to trap at almost any kernel address and |
| 38 | execute a callback function. register_kprobe() establishes | 38 | execute a callback function. register_kprobe() establishes |