diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:21:40 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 15:21:40 -0800 |
commit | d1ffa5669cd834f901141756e63195f48c1bfbf9 (patch) | |
tree | f0bed266c1f3fef528bbced56b48aac63e0a26b1 /fs/Kconfig | |
parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
parent | 6eff5790d57a5c9c01489c95946881808a4b2a2c (diff) | |
download | linux-3.10-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.gz linux-3.10-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.bz2 linux-3.10-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip |
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 93b5dc4082f..e9749b0eecd 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -883,8 +883,6 @@ config CONFIGFS_FS Both sysfs and configfs can and should exist together on the same system. One is not a replacement for the other. - If unsure, say N. - endmenu menu "Miscellaneous filesystems" |