Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 024d0e5e3e5d4f03cb0d94b3039e6f7cfbc446cc..7f0b04b4caa7b50e11cbbc8fe8b584f77c66ade4 100644 (file)
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -3,9 +3,9 @@
 #
 
 # Core functionality.
 #
 
 # Core functionality.

+obj-$(CONFIG_MTD)              += mtd.o

 mtd-y                          := mtdcore.o mtdsuper.o
 mtd-$(CONFIG_MTD_PARTITIONS)   += mtdpart.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
 
 obj-$(CONFIG_MTD_CONCAT)       += mtdconcat.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o