Merge branch 'linus' into pci-for-jesse

[linux-2.6] / fs / ramfs / Makefile

diff --git a/fs/ramfs/Makefile b/fs/ramfs/Makefile
index f096f30070913f88667f549080dedb9a8d80b6f9..c71e65dcad2575f60f5776f88061681d1f24f33f 100644 (file)
--- a/fs/ramfs/Makefile
+++ b/fs/ramfs/Makefile
@@ -2,6 +2,8 @@
 # Makefile for the linux ramfs routines.
 #
 
-obj-$(CONFIG_RAMFS) += ramfs.o
+obj-y += 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)