Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / mtd / Makefile

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 1e36b9a..9205540 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -15,15 +15,18 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
 
 # 'Users' - code which presents functionality to userspace.
 obj-$(CONFIG_MTD_CHAR)         += mtdchar.o
-obj-$(CONFIG_MTD_BLOCK)                += mtdblock.o mtd_blkdevs.o
-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
-obj-$(CONFIG_SSFDC)            += ssfdc.o mtd_blkdevs.o
+obj-$(CONFIG_MTD_BLKDEVS)      += mtd_blkdevs.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_INFTL)            += inftl.o
+obj-$(CONFIG_RFD_FTL)          += rfd_ftl.o
+obj-$(CONFIG_SSFDC)            += ssfdc.o
 
 nftl-objs              := nftlcore.o nftlmount.o
 inftl-objs             := inftlcore.o inftlmount.o
 
 obj-y          += chips/ maps/ devices/ nand/ onenand/
+
+obj-$(CONFIG_MTD_UBI)          += ubi/