Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / mtd / nand / Makefile

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index e7cf382297a8a4bfe9d48380a64130bfa62fa30e..69da27e2285e107aab70b90915c43f5a03de027e 100644 (file)
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -6,6 +6,7 @@
 obj-$(CONFIG_MTD_NAND)                 += nand.o nand_ecc.o
 obj-$(CONFIG_MTD_NAND_IDS)             += nand_ids.o
 
+obj-$(CONFIG_MTD_NAND_CAFE)            += cafe_nand.o
 obj-$(CONFIG_MTD_NAND_SPIA)            += spia.o
 obj-$(CONFIG_MTD_NAND_AMS_DELTA)       += ams-delta.o
 obj-$(CONFIG_MTD_NAND_TOTO)            += toto.o
@@ -24,5 +25,7 @@ obj-$(CONFIG_MTD_NAND_CS553X)         += cs553x_nand.o
 obj-$(CONFIG_MTD_NAND_NDFC)            += ndfc.o
 obj-$(CONFIG_MTD_NAND_OMAP)            += omap-nand-flash.o
 obj-$(CONFIG_MTD_NAND_OMAP_HW)         += omap-hw.o
+obj-$(CONFIG_MTD_NAND_AT91)            += at91_nand.o
 
-nand-objs = nand_base.o nand_bbt.o
+nand-objs := nand_base.o nand_bbt.o
+cafe_nand-objs := cafe.o cafe_ecc.o