mtd/drivers/mtd Makefile.common,1.2,1.3

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv25155

Modified Files:
	Makefile.common 
Log Message:
Merge from 2.6


Index: Makefile.common
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/Makefile.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.common	23 May 2003 11:38:29 -0000	1.2
+++ Makefile.common	12 Jul 2004 16:07:30 -0000	1.3
@@ -3,22 +3,6 @@
 #
 # $Id$
 
-#                       *** BIG UGLY NOTE ***
-#
-# The shiny new inter_module_xxx has introduced yet another ugly link
-# order dependency, which I'd previously taken great care to avoid.
-# We now have to ensure that the chip drivers are initialised before the
-# map drivers, and that the doc200[01] drivers are initialised before
-# docprobe.
-#
-# We'll hopefully merge the doc200[01] drivers and docprobe back into
-# a single driver some time soon, but the CFI drivers are going to have
-# to stay like that.
-#
-# Urgh.
-# 
-# dwmw2 21/11/0
-
 # Core functionality.
 obj-$(CONFIG_MTD)		+= mtdcore.o
 obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o
@@ -38,35 +22,4 @@
 nftl-objs		:= nftlcore.o nftlmount.o
 inftl-objs		:= inftlcore.o inftlmount.o
 
-ifeq ($(PATCHLEVEL),4)
-
-export-objs	:= mtdcore.o mtdpart.o redboot.o cmdlinepart.o afs.o \
-		   mtdconcat.o mtd_blkdevs-24.o
-
-mtd_blkdevs-objs	:= mtd_blkdevs-24.o
-
-obj-y           += chips/chipslink.o maps/mapslink.o \
-			devices/devlink.o nand/nandlink.o
-
-O_TARGET	:= mtdlink.o
-
-list-multi	:= nftl.o inftl.o mtd_blkdevs.o
-
-mod-subdirs	:= 
-subdir-y	:= chips maps devices nand
-subdir-m	:= $(subdir-y)
-
-include $(TOPDIR)/Rules.make
-
-nftl.o: $(nftl-objs)
-	$(LD) -r -o $@ $(nftl-objs)
-
-inftl.o: $(inftl-objs)
-	$(LD) -r -o $@ $(inftl-objs)
-
-mtd_blkdevs.o: $(mtd_blkdevs-objs)
-	$(LD) -r -o $@ $(mtd_blkdevs-objs)
-
-else
 obj-y		+= chips/ maps/ devices/ nand/
-endif