mtd/drivers/mtd/nand Makefile.common,1.8,1.9

[David Woodhouse]

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

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


Index: Makefile.common
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/Makefile.common,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.common	17 Jun 2004 02:43:24 -0000	1.8
+++ Makefile.common	12 Jul 2004 16:07:31 -0000	1.9
@@ -3,27 +3,17 @@
 #
 # $Id$
 
-ifeq ($(PATCHLEVEL),4)
-O_TARGET			:= nandlink.o
-export-objs			:= nand_base.o nand_bbt.o nand_ecc.o nand_ids.o
-list-multi			:= nand.o
-endif
+obj-$(CONFIG_MTD_NAND)			+= nand.o nand_ecc.o
+obj-$(CONFIG_MTD_NAND_IDS)		+= nand_ids.o
 
-obj-$(CONFIG_MTD_NAND)		+= nand.o nand_ecc.o
-obj-$(CONFIG_MTD_NAND_SPIA)	+= spia.o
-obj-$(CONFIG_MTD_NAND_TOTO)	+= toto.o
-obj-$(CONFIG_MTD_NAND_AUTCPU12)	+= autcpu12.o
-obj-$(CONFIG_MTD_NAND_EDB7312)  += edb7312.o
-obj-$(CONFIG_MTD_NAND_TX4925NDFMC)  += tx4925ndfmc.o
-obj-$(CONFIG_MTD_NAND_TX4938NDFMC)  += tx4938ndfmc.o
-obj-$(CONFIG_MTD_NAND_AU1550)	  += au1550nd.o
-obj-$(CONFIG_MTD_NAND_IDS)	+= nand_ids.o
-obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB)   += ppchameleonevb.o
-obj-$(CONFIG_MTD_NAND_DISKONCHIP) += diskonchip.o
+obj-$(CONFIG_MTD_NAND_SPIA)		+= spia.o
+obj-$(CONFIG_MTD_NAND_TOTO)		+= toto.o
+obj-$(CONFIG_MTD_NAND_AUTCPU12)		+= autcpu12.o
+obj-$(CONFIG_MTD_NAND_EDB7312)		+= edb7312.o
+obj-$(CONFIG_MTD_NAND_TX4925NDFMC)	+= tx4925ndfmc.o
+obj-$(CONFIG_MTD_NAND_TX4938NDFMC)	+= tx4938ndfmc.o
+obj-$(CONFIG_MTD_NAND_AU1550)		+= au1550nd.o
+obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB)	+= ppchameleonevb.o
+obj-$(CONFIG_MTD_NAND_DISKONCHIP)	+= diskonchip.o
 
 nand-objs = nand_base.o nand_bbt.o
-
--include $(TOPDIR)/Rules.make
-
-nand.o: $(nand-objs)
-	$(LD) -r -o $@ $(nand-objs)