diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-15 10:36:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-15 10:36:41 -0400 |
commit | 0fb74dfb08b3d40e41ffdb6540078dcac433ac7a (patch) | |
tree | e4bbd3246984cb7433c7c5d0bcca2e7769fc81a6 /arch/m32r/Kconfig | |
parent | 40796c5e8f2a93008e9034b3110a7e7b1fa0fba0 (diff) | |
parent | 4db2ce0199f04b6e99999f22e28ef9a0ae5f0d2f (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/m32r/Kconfig')
-rw-r--r-- | arch/m32r/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 1ef3987ebc6a..4d100f3886e1 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -220,11 +220,6 @@ config PREEMPT | |||
220 | Say Y here if you are building a kernel for a desktop, embedded | 220 | Say Y here if you are building a kernel for a desktop, embedded |
221 | or real-time system. Say N if you are unsure. | 221 | or real-time system. Say N if you are unsure. |
222 | 222 | ||
223 | config HAVE_DEC_LOCK | ||
224 | bool | ||
225 | depends on (SMP || PREEMPT) | ||
226 | default n | ||
227 | |||
228 | config SMP | 223 | config SMP |
229 | bool "Symmetric multi-processing support" | 224 | bool "Symmetric multi-processing support" |
230 | ---help--- | 225 | ---help--- |