Commit bea69dca authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] trivial: Make JFFS2 ready for Linux 2.7

From: Rusty Russell <rusty@rustcorp.com.au>

(OK from maintainer  	David Woodhouse <dwmw2@infradead.org>)
 From:  Sam Ravnborg <sam@ravnborg.org>

  From:  <l.s.r@web.de>
  >   since the code for Linux 2.4 compatibility in fs/jffs2 is gone, we can
  >   clean up the Makefile a bit. Following patch makes the Makefile
  >   compatible with Linux 2.7 instead . :) Please consider applying.

  If we are going to clean up this I prefer we get rid of the
  local variables.
  See attached patch.

  	Sam
parent a5849316
...@@ -6,16 +6,10 @@ ...@@ -6,16 +6,10 @@
obj-$(CONFIG_JFFS2_FS) += jffs2.o obj-$(CONFIG_JFFS2_FS) += jffs2.o
COMPR_OBJS := compr.o compr_rubin.o compr_rtime.o compr_zlib.o jffs2-y := compr.o compr_rubin.o compr_rtime.o compr_zlib.o
JFFS2_OBJS := dir.o file.o ioctl.o nodelist.o malloc.o \ jffs2-y += dir.o file.o ioctl.o nodelist.o malloc.o
read.o nodemgmt.o readinode.o write.o scan.o gc.o \ jffs2-y += read.o nodemgmt.o readinode.o write.o scan.o gc.o
symlink.o build.o erase.o background.o fs.o writev.o jffs2-y += symlink.o build.o erase.o background.o fs.o writev.o
jffs2-y += super.o
LINUX_OBJS-24 := super-v24.o crc32.o jffs2-$(CONFIG_JFFS2_FS_NAND) := wbuf.o
LINUX_OBJS-25 := super.o
LINUX_OBJS-26 := super.o
NAND_OBJS-$(CONFIG_JFFS2_FS_NAND) := wbuf.o
jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
$(LINUX_OBJS-$(VERSION)$(PATCHLEVEL))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment