Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/Makefile between commit
47a72688fae7298e1ad5fdc9bff7e04b6a549620 ("mtd: flash mapping support for
Dreamcast VMU") from the sh tree and commit
610f75e74b636f933bc3e379a88a10f883b91332 ("[MTD] RBTX4939 map driver")
from the mtd tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/mtd/maps/Makefile
index 26b28a7,f53a7dc..0000000
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@@ -61,4 -61,4 +61,5 @@@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o
+obj-$(CONFIG_MTD_VMU) += vmu-flash.o
+ obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
