Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
Conflicts: drivers/mtd/Makefile
This commit is contained in:
@@ -29,6 +29,6 @@ obj-$(CONFIG_MTD_OOPS) += mtdoops.o
|
||||
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/
|
||||
|
||||
Reference in New Issue
Block a user