Merge branch 'linus' into cpus4096

1 files changed, 13 insertions, 0 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 97e3bdedb1e6..d3873583360b 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1383,6 +1383,19 @@ config MINIX_FS
           partition (the one containing the directory /) cannot be compiled as
           a module.
 
+config OMFS_FS
+        tristate "SonicBlue Optimized MPEG File System support"
+        depends on BLOCK
+        select CRC_ITU_T
+        help
+          This is the proprietary file system used by the Rio Karma music
+          player and ReplayTV DVR.  Despite the name, this filesystem is not
+          more efficient than a standard FS for MPEG files, in fact likely
+          the opposite is true.  Say Y if you have either of these devices
+          and wish to mount its disk.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called omfs.  If unsure, say N.
 
 config HPFS_FS
         tristate "OS/2 HPFS file system support"