Merge 'staging-next' to Linus's tree

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

diff --git a/drivers/staging/smbfs/Kconfig b/drivers/staging/smbfs/Kconfig
index e668127c8b2e7bcd5fdab9aaab08ffc10ce6e163..2bc24a8c40390417d2537cd8518dc58ecd9eda2d 100644 (file)
--- a/drivers/staging/smbfs/Kconfig
+++ b/drivers/staging/smbfs/Kconfig
@@ -1,5 +1,6 @@
 config SMB_FS
        tristate "SMB file system support (OBSOLETE, please use CIFS)"
+       depends on BKL # probably unfixable
        depends on INET
        select NLS
        help