diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /fs/Kconfig | |
parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 13 |
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 | |||
1383 | partition (the one containing the directory /) cannot be compiled as | 1383 | partition (the one containing the directory /) cannot be compiled as |
1384 | a module. | 1384 | a module. |
1385 | 1385 | ||
1386 | config OMFS_FS | ||
1387 | tristate "SonicBlue Optimized MPEG File System support" | ||
1388 | depends on BLOCK | ||
1389 | select CRC_ITU_T | ||
1390 | help | ||
1391 | This is the proprietary file system used by the Rio Karma music | ||
1392 | player and ReplayTV DVR. Despite the name, this filesystem is not | ||
1393 | more efficient than a standard FS for MPEG files, in fact likely | ||
1394 | the opposite is true. Say Y if you have either of these devices | ||
1395 | and wish to mount its disk. | ||
1396 | |||
1397 | To compile this file system support as a module, choose M here: the | ||
1398 | module will be called omfs. If unsure, say N. | ||
1386 | 1399 | ||
1387 | config HPFS_FS | 1400 | config HPFS_FS |
1388 | tristate "OS/2 HPFS file system support" | 1401 | tristate "OS/2 HPFS file system support" |