Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / autofs / Kconfig

diff --git a/drivers/staging/autofs/Kconfig b/drivers/staging/autofs/Kconfig
index 5f3bea90911e5a81238bbee7765b6be54dddc996..480e210c83ab1f46ea9ee9a0b326d46132290c78 100644 (file)
--- a/drivers/staging/autofs/Kconfig
+++ b/drivers/staging/autofs/Kconfig
@@ -1,5 +1,6 @@
 config AUTOFS_FS
        tristate "Kernel automounter support"
+       depends on BKL # unfixable, just use autofs4
        help
          The automounter is a tool to automatically mount remote file systems
          on demand. This implementation is partially kernel-based to reduce