Merge branch 'ucc_geth' of master.kernel.org:/pub/scm/linux/kernel/git/leo/fsl-soc...

[linux-2.6] / drivers / mtd / Makefile

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index c130e6261adfe6a02c1eab2409963f61900d5e03..6d958a4566ffdf041397b9c685a76b88587493d4 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,12 +1,11 @@
 #
 # Makefile for the memory technology device drivers.
 #
-# $Id: Makefile.common,v 1.7 2005/07/11 10:39:27 gleixner Exp $
 
 # Core functionality.
-mtd-y                          := mtdcore.o
+obj-$(CONFIG_MTD)              += mtd.o
+mtd-y                          := mtdcore.o mtdsuper.o
 mtd-$(CONFIG_MTD_PARTITIONS)   += mtdpart.o
-obj-$(CONFIG_MTD)              += $(mtd-y)
 
 obj-$(CONFIG_MTD_CONCAT)       += mtdconcat.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
@@ -28,3 +27,5 @@ nftl-objs             := nftlcore.o nftlmount.o
 inftl-objs             := inftlcore.o inftlmount.o
 
 obj-y          += chips/ maps/ devices/ nand/ onenand/
+
+obj-$(CONFIG_MTD_UBI)          += ubi/