Re: [PATCH] jffs2 super.o for 2.6.0-test1

Ben Collins (bcollins@debian.org)
Mon, 14 Jul 2003 11:10:59 -0400


On Mon, Jul 14, 2003 at 10:54:58AM -0400, Jamey Hicks wrote:
>
> Trivial patch to reenable jffs2 for 2.6.0-test1.

Seems this might be better, to keep it from being a re-occuring
problem.

Index: linux-2.6/fs/jffs2/Makefile
===================================================================
--- linux-2.6/fs/jffs2/Makefile (revision 11779)
+++ linux-2.6/fs/jffs2/Makefile (working copy)
@@ -11,10 +11,13 @@
read.o nodemgmt.o readinode.o write.o scan.o gc.o \
symlink.o build.o erase.o background.o fs.o writev.o

-LINUX_OBJS-24 := super-v24.o crc32.o
-LINUX_OBJS-25 := super.o
+ifeq ($(VERSION)$(PATCHLEVEL),2.4)
+LINUX_OBJS := super-v24.o crc32.o
+else
+LINUX_OBJS := super.o
+endif

NAND_OBJS-$(CONFIG_JFFS2_FS_NAND) := wbuf.o

jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
- $(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
+ $(LINUX_OBJS)

-- 
Debian     - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo       - http://www.deqo.com/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/