mtd/drivers/mtd Makefile,1.70,1.71

[David Woodhouse]

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

Modified Files:
	Makefile 
Log Message:
makefile changes for mtd_blkdevs core

Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Makefile	18 May 2003 10:50:25 -0000	1.70
+++ Makefile	18 May 2003 19:11:20 -0000	1.71
@@ -35,7 +35,7 @@
 # dwmw2 21/11/0
 
 # Core functionality.
-obj-$(CONFIG_MTD)		+= mtdcore.o mtd_blkdevs.o new_mtdblock.o
+obj-$(CONFIG_MTD)		+= mtdcore.o
 obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o
 obj-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
@@ -44,10 +44,10 @@
 
 # 'Users' - code which presents functionality to userspace.
 obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
-obj-$(CONFIG_MTD_BLOCK)		+= mtdblock.o
-obj-$(CONFIG_MTD_BLOCK_RO)	+= mtdblock_ro.o
-obj-$(CONFIG_FTL)		+= ftl.o
-obj-$(CONFIG_NFTL)		+= nftl.o
+obj-$(CONFIG_MTD_BLOCK)		+= mtdblock.o $(mtd_blkdevs)
+obj-$(CONFIG_MTD_BLOCK_RO)	+= mtdblock_ro.o $(mtd_blkdevs)
+obj-$(CONFIG_FTL)		+= ftl.o $(mtd_blkdevs)
+obj-$(CONFIG_NFTL)		+= nftl.o $(mtd_blkdevs)
 
 ifeq ($(BELOW25),y)
 obj-y           += chips/chipslink.o maps/mapslink.o \
@@ -60,10 +60,10 @@
 mod-subdirs	:= 
 subdir-y	:= chips maps devices nand
 subdir-m	:= $(subdir-y)
-mtdblock-objs	+= mtdblock-24.o
+mtd_blkdevs	+= mtd_blkdevs-24.o
 else
 obj-y           += chips/ maps/ devices/ nand/
-mtdblock-objs	+= mtdblock-25.o
+mtd_blkdevs	+= mtd_blkdevs.o
 endif
 
 include $(TOPDIR)/Rules.make
@@ -73,6 +73,4 @@
 nftl.o: $(nftl-objs)
 	$(LD) -r -o $@ $(nftl-objs)
 
-mtdblock.o: $(mtdblock-objs)
-	$(LD) -r -o $@ $(mtdblock-objs)
 endif