Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / kernel / Kconfig.preempt

diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index 6b066632e40c2a9f0621d487d0caf5a7700c7b41..bf987b95b3560fbd0a7d8a820335100a55e1d105 100644 (file)
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -52,17 +52,3 @@ config PREEMPT
 
 endchoice
 
-config PREEMPT_BKL
-       bool "Preempt The Big Kernel Lock"
-       depends on SMP || PREEMPT
-       default y
-       help
-         This option reduces the latency of the kernel by making the
-         big kernel lock preemptible.
-
-         Say Y here if you are building a kernel for a desktop system.
-         Say N if you are unsure.
-
-config PREEMPT_NOTIFIERS
-       bool
-