| commit | 572acc41274522b865440d0644d5f986e3c83755 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Mon Jan 05 16:24:55 2009 +0000 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Mon Jan 05 16:24:55 2009 +0000 |
| tree | e1f6f2968299d35de6ef4ec04524f65d28342b1a | |
| parent | 60f26520e7bd4479dbebf77317c45fc2255ba2e8 [diff] [blame] | |
| parent | 9faa8153bef4d82395e6ff7f87cb7c457055007c [diff] [blame] |
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6 Conflicts: drivers/mtd/Makefile
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 7fb3dfb..4521b1e 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile
@@ -29,6 +29,6 @@ nftl-objs := nftlcore.o nftlmount.o inftl-objs := inftlcore.o inftlmount.o -obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ +obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/ obj-$(CONFIG_MTD_UBI) += ubi/