mtd: nand: omap2: Rename shippable module to omap2_nand

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=092f05c3eccbd616a0cfa21945412a3e82a9fb6c
Commit:     092f05c3eccbd616a0cfa21945412a3e82a9fb6c
Parent:     a1d97ef96e3899ad9d4ec0024f9b4927e0490689
Author:     Roger Quadros <rogerq at ti.com>
AuthorDate: Fri Aug 21 13:45:35 2015 +0300
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Sep 2 14:04:49 2015 -0700

    mtd: nand: omap2: Rename shippable module to omap2_nand
    
    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 at gmail.com>
    Signed-off-by: Roger Quadros <rogerq at ti.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 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
 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