diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-14 00:09:23 +0200 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-14 00:09:23 +0200 |
commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
tree | 490a9578995705de69712893a190b67651bddc56 /fs/jffs2/Makefile | |
parent | Automatic merge with /usr/src/ntfs-2.6.git. (diff) | |
parent | [PATCH] v850: Align ___start___param to match parameter alignment (diff) | |
download | linux-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz linux-c514720716c7b109ff980f8b3cb93f9af872c91c.zip |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/jffs2/Makefile')
-rw-r--r-- | fs/jffs2/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile index e3c38ccf9c7d..f1afe681ecd6 100644 --- a/fs/jffs2/Makefile +++ b/fs/jffs2/Makefile @@ -1,7 +1,7 @@ # # Makefile for the Linux Journalling Flash File System v2 (JFFS2) # -# $Id: Makefile.common,v 1.7 2004/11/03 12:57:38 jwboyer Exp $ +# $Id: Makefile.common,v 1.9 2005/02/09 09:23:53 pavlov Exp $ # obj-$(CONFIG_JFFS2_FS) += jffs2.o @@ -11,8 +11,7 @@ jffs2-y += read.o nodemgmt.o readinode.o write.o scan.o gc.o jffs2-y += symlink.o build.o erase.o background.o fs.o writev.o jffs2-y += super.o -jffs2-$(CONFIG_JFFS2_FS_NAND) += wbuf.o -jffs2-$(CONFIG_JFFS2_FS_NOR_ECC) += wbuf.o +jffs2-$(CONFIG_JFFS2_FS_WRITEBUFFER) += wbuf.o jffs2-$(CONFIG_JFFS2_RUBIN) += compr_rubin.o jffs2-$(CONFIG_JFFS2_RTIME) += compr_rtime.o jffs2-$(CONFIG_JFFS2_ZLIB) += compr_zlib.o |