Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[deliverable/linux.git] / fs / ramfs / Makefile

diff --git a/fs/ramfs/Makefile b/fs/ramfs/Makefile
index f096f30070913f88667f549080dedb9a8d80b6f9..5a0236e02ee1f28a828e975ebbef3df998b6ec30 100644 (file)
--- a/fs/ramfs/Makefile
+++ b/fs/ramfs/Makefile
@@ -4,4 +4,6 @@
 
 obj-$(CONFIG_RAMFS) += ramfs.o
 
-ramfs-objs := inode.o
+file-mmu-y := file-nommu.o
+file-mmu-$(CONFIG_MMU) := file-mmu.o
+ramfs-objs += inode.o $(file-mmu-y)