Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes

[karo-tx-linux.git] / fs / ufs / Kconfig

diff --git a/fs/ufs/Kconfig b/fs/ufs/Kconfig
index 30c8f223253d29f7b67f2c2e72a483b1ffdec7b9..e4f10a40768a436d1b50a133c68b1668679d7541 100644 (file)
--- a/fs/ufs/Kconfig
+++ b/fs/ufs/Kconfig
@@ -1,7 +1,6 @@
 config UFS_FS
        tristate "UFS file system support (read only)"
        depends on BLOCK
-       depends on BKL # probably fixable
        help
          BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
          OpenBSD and NeXTstep) use a file system called UFS. Some System V