aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/Makefile
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-01-05 11:24:55 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-01-05 11:24:55 -0500
commit572acc41274522b865440d0644d5f986e3c83755 (patch)
treee1f6f2968299d35de6ef4ec04524f65d28342b1a /drivers/mtd/Makefile
parent60f26520e7bd4479dbebf77317c45fc2255ba2e8 (diff)
parent9faa8153bef4d82395e6ff7f87cb7c457055007c (diff)
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
Conflicts: drivers/mtd/Makefile
Diffstat (limited to 'drivers/mtd/Makefile')
-rw-r--r--drivers/mtd/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 7fb3dfbb4579..4521b1ecce45 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -29,6 +29,6 @@ obj-$(CONFIG_MTD_OOPS) += mtdoops.o
29nftl-objs := nftlcore.o nftlmount.o 29nftl-objs := nftlcore.o nftlmount.o
30inftl-objs := inftlcore.o inftlmount.o 30inftl-objs := inftlcore.o inftlmount.o
31 31
32obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ 32obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
33 33
34obj-$(CONFIG_MTD_UBI) += ubi/ 34obj-$(CONFIG_MTD_UBI) += ubi/