Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 46835158a9705ce3d7dd9e652e3886b0f6539e60..2aadcf9d48d9a535f44f30355bebd0616f543ec7 100644 (file)
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -32,5 +32,8 @@ obj-$(CONFIG_MTD_NAND_CM_X270)                += cmx270_nand.o
 obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)   += excite_nandflash.o
 obj-$(CONFIG_MTD_NAND_PLATFORM)                += plat_nand.o
 obj-$(CONFIG_MTD_ALAUDA)               += alauda.o
+obj-$(CONFIG_MTD_NAND_PASEMI)          += pasemi_nand.o
+obj-$(CONFIG_MTD_NAND_ORION)           += orion_nand.o
+obj-$(CONFIG_MTD_NAND_FSL_ELBC)                += fsl_elbc_nand.o
 
 nand-objs := nand_base.o nand_bbt.o