diff options
-rw-r--r-- | fs/Kconfig | 14 | ||||
-rw-r--r-- | fs/Makefile | 2 | ||||
-rw-r--r-- | fs/ramfs/Makefile | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 9a40a9c665c7..f0df9a2e19e1 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -999,20 +999,6 @@ config HUGETLBFS | |||
999 | config HUGETLB_PAGE | 999 | config HUGETLB_PAGE |
1000 | def_bool HUGETLBFS | 1000 | def_bool HUGETLBFS |
1001 | 1001 | ||
1002 | config RAMFS | ||
1003 | bool | ||
1004 | default y | ||
1005 | ---help--- | ||
1006 | Ramfs is a file system which keeps all files in RAM. It allows | ||
1007 | read and write access. | ||
1008 | |||
1009 | It is more of an programming example than a useable file system. If | ||
1010 | you need a file system which lives in RAM with limit checking use | ||
1011 | tmpfs. | ||
1012 | |||
1013 | To compile this as a module, choose M here: the module will be called | ||
1014 | ramfs. | ||
1015 | |||
1016 | config CONFIGFS_FS | 1002 | config CONFIGFS_FS |
1017 | tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)" | 1003 | tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)" |
1018 | depends on SYSFS && EXPERIMENTAL | 1004 | depends on SYSFS && EXPERIMENTAL |
diff --git a/fs/Makefile b/fs/Makefile index 720c29d57a62..500cf15cdb4b 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
@@ -72,7 +72,7 @@ obj-$(CONFIG_JBD) += jbd/ | |||
72 | obj-$(CONFIG_JBD2) += jbd2/ | 72 | obj-$(CONFIG_JBD2) += jbd2/ |
73 | obj-$(CONFIG_EXT2_FS) += ext2/ | 73 | obj-$(CONFIG_EXT2_FS) += ext2/ |
74 | obj-$(CONFIG_CRAMFS) += cramfs/ | 74 | obj-$(CONFIG_CRAMFS) += cramfs/ |
75 | obj-$(CONFIG_RAMFS) += ramfs/ | 75 | obj-y += ramfs/ |
76 | obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ | 76 | obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ |
77 | obj-$(CONFIG_CODA_FS) += coda/ | 77 | obj-$(CONFIG_CODA_FS) += coda/ |
78 | obj-$(CONFIG_MINIX_FS) += minix/ | 78 | obj-$(CONFIG_MINIX_FS) += minix/ |
diff --git a/fs/ramfs/Makefile b/fs/ramfs/Makefile index 5a0236e02ee1..c71e65dcad25 100644 --- a/fs/ramfs/Makefile +++ b/fs/ramfs/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the linux ramfs routines. | 2 | # Makefile for the linux ramfs routines. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_RAMFS) += ramfs.o | 5 | obj-y += ramfs.o |
6 | 6 | ||
7 | file-mmu-y := file-nommu.o | 7 | file-mmu-y := file-nommu.o |
8 | file-mmu-$(CONFIG_MMU) := file-mmu.o | 8 | file-mmu-$(CONFIG_MMU) := file-mmu.o |