From 5ee7ade8eb95405b9e46b789b236404880a8f869 Mon Sep 17 00:00:00 2001
From: Bob Copeland <me@bobcopeland.com>
Date: Fri, 25 Jul 2008 19:45:17 -0700
Subject: [PATCH] --- yaml --- r: 106178 b: refs/heads/master c:
 63ca8ce2a2641f9cb5f0add33ced4591681d1cd7 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/Kconfig       | 13 +++++++++++++
 trunk/fs/Makefile      |  1 +
 trunk/fs/omfs/Makefile |  4 ++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 trunk/fs/omfs/Makefile

diff --git a/[refs] b/[refs]
index 71a2c7e7db75..69f7a4c20885 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36cc410a6799a205bfc6ccc38abd9d52f2afba64
+refs/heads/master: 63ca8ce2a2641f9cb5f0add33ced4591681d1cd7
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 97e3bdedb1e6..d3873583360b 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/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"
diff --git a/trunk/fs/Makefile b/trunk/fs/Makefile
index 3b2178b4bb66..a1482a5eff15 100644
--- a/trunk/fs/Makefile
+++ b/trunk/fs/Makefile
@@ -111,6 +111,7 @@ obj-$(CONFIG_ADFS_FS)		+= adfs/
 obj-$(CONFIG_FUSE_FS)		+= fuse/
 obj-$(CONFIG_UDF_FS)		+= udf/
 obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+obj-$(CONFIG_OMFS_FS)		+= omfs/
 obj-$(CONFIG_JFS_FS)		+= jfs/
 obj-$(CONFIG_XFS_FS)		+= xfs/
 obj-$(CONFIG_9P_FS)		+= 9p/
diff --git a/trunk/fs/omfs/Makefile b/trunk/fs/omfs/Makefile
new file mode 100644
index 000000000000..8b82b63f1129
--- /dev/null
+++ b/trunk/fs/omfs/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_OMFS_FS) += omfs.o
+
+omfs-y := bitmap.o dir.o file.o inode.o