Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index eb4b33725db114984f4a967119a59e9892b225c3..2e9a1457132cdbcd7cc3911a4d0db4e07a897e21 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1220,3 +1220,4 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
        bool
 
+source "kernel/Kconfig.locks"