diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /fs/Kconfig | |
parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index cf12c403b8c7..2694648cbd1b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -830,7 +830,7 @@ config NTFS_FS | |||
830 | from the project web site. | 830 | from the project web site. |
831 | 831 | ||
832 | For more information see <file:Documentation/filesystems/ntfs.txt> | 832 | For more information see <file:Documentation/filesystems/ntfs.txt> |
833 | and <http://linux-ntfs.sourceforge.net/>. | 833 | and <http://www.linux-ntfs.org/>. |
834 | 834 | ||
835 | To compile this file system support as a module, choose M here: the | 835 | To compile this file system support as a module, choose M here: the |
836 | module will be called ntfs. | 836 | module will be called ntfs. |