Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / mtd / Makefile

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 2915a53..fc93744 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,28 +1,14 @@
 #
 # Makefile for the memory technology device drivers.
 #
-# $Id: Makefile.common,v 1.2 2003/05/23 11:38:29 dwmw2 Exp $
-
-#                       *** 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
+# $Id: Makefile.common,v 1.7 2005/07/11 10:39:27 gleixner Exp $
 
 # Core functionality.
-obj-$(CONFIG_MTD)              += mtdcore.o
+mtd-y                          := mtdcore.o
+mtd-$(CONFIG_MTD_PARTITIONS)   += mtdpart.o
+obj-$(CONFIG_MTD)              += $(mtd-y)
+
 obj-$(CONFIG_MTD_CONCAT)       += mtdconcat.o
-obj-$(CONFIG_MTD_PARTITIONS)   += mtdpart.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
 obj-$(CONFIG_MTD_AFS_PARTS)    += afs.o
@@ -34,8 +20,9 @@ obj-$(CONFIG_MTD_BLOCK_RO)    += mtdblock_ro.o mtd_blkdevs.o
 obj-$(CONFIG_FTL)              += ftl.o mtd_blkdevs.o
 obj-$(CONFIG_NFTL)             += nftl.o mtd_blkdevs.o
 obj-$(CONFIG_INFTL)            += inftl.o mtd_blkdevs.o
+obj-$(CONFIG_RFD_FTL)          += rfd_ftl.o mtd_blkdevs.o
 
 nftl-objs              := nftlcore.o nftlmount.o
 inftl-objs             := inftlcore.o inftlmount.o
 
-obj-y          += chips/ maps/ devices/ nand/
+obj-y          += chips/ maps/ devices/ nand/ onenand/