On 03/09/15 00:06, Brian Norris wrote: > On Fri, Aug 21, 2015 at 01:45:35PM +0300, Roger Quadros wrote: >> As both omap2 onenand and omap2 nand driver modules are >> named the same i.e. "omap2.ko", only one of them gets shipped >> during MODPOST if both are configured as loadable modules. >> >> To avoid this ambiguity let's ship the omap2 nand >> driver as "omap2_nand.ko" >> >> Reported by Pierre Neyron via github >> https://github.com/beagleboard/linux/issues/40 >> >> Cc: Robert Nelson <robertcnelson@xxxxxxxxx> >> Signed-off-by: Roger Quadros <rogerq@xxxxxx> >> --- >> drivers/mtd/nand/Makefile | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile >> index 1f897ec..075a027 100644 >> --- a/drivers/mtd/nand/Makefile >> +++ b/drivers/mtd/nand/Makefile >> @@ -26,7 +26,8 @@ obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o >> obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o >> obj-$(CONFIG_MTD_NAND_ATMEL) += atmel_nand.o >> obj-$(CONFIG_MTD_NAND_GPIO) += gpio.o >> -obj-$(CONFIG_MTD_NAND_OMAP2) += omap2.o >> +omap2_nand-objs := omap2.o >> +obj-$(CONFIG_MTD_NAND_OMAP2) += omap2_nand.o > > Pushed to l2-mtd.git. I suppose this one should go out for 4.3, as > there's little downside to it, and it's kind of a bugfix. That is perfectly fine. Thanks. cheers, -roger > >> obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD) += omap_elm.o >> obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o >> obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o >> -- >> 2.1.4 >> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
