Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 5e8e9d9ccb331ffe1a88c32f402a70eefca4ad18..11c59329ed0647837604dbd0a832dd2935db226b 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -674,12 +674,6 @@ config ZISOFS
          necessary to create such a filesystem.  Say Y here if you want to be
          able to read such compressed CD-ROMs.
 
-config ZISOFS_FS
-# for fs/nls/Config.in
-       tristate
-       depends on ZISOFS
-       default ISO9660_FS
-
 config UDF_FS
        tristate "UDF file system support"
        help