Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f04f68e authored by Brian Norris's avatar Brian Norris
Browse files

mtd: physmap_of: fixup gemini/versatile dependencies 



physmap_of sort of depends on the gemini and versatile modules (when
they're enabled), but this isn't expressed in Kconfig. Let's just merge
the modules all together, when enabled. Then we can avoid exporting a
few symbols, and the versatile and gemini code can now be modular again
(the below commit accidentally made them built-in only).

Resolves errors like this:

ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!
ERROR: "of_flash_probe_gemini" [drivers/mtd/maps/physmap_of.ko] undefined!

Fixes: 56ff337e ("mtd: physmap_of: add a hook for Gemini flash probing")
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 42e9401b

drivers/mtd/maps/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -17,9 +17,13 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o 
obj-$(CONFIG_MTD_TSUNAMI)	+= tsunami_flash.o

obj-$(CONFIG_MTD_PXA2XX)	+= pxa2xx-flash.o

obj-$(CONFIG_MTD_PHYSMAP)	+= physmap.o

ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE

physmap_of-objs += physmap_of_versatile.o

endif

ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI

physmap_of-objs += physmap_of_gemini.o

endif

obj-$(CONFIG_MTD_PHYSMAP_OF)	+= physmap_of.o

obj-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE)	+= physmap_of_versatile.o

obj-$(CONFIG_MTD_PHYSMAP_OF_GEMINI)	+= physmap_of_gemini.o

obj-$(CONFIG_MTD_PISMO)		+= pismo.o

obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o

obj-$(CONFIG_MTD_PCMCIA)	+= pcmciamtd.o

drivers/mtd/maps/physmap_of_gemini.c

+0 −1
Original line number Diff line number Diff line
@@ -115,4 +115,3 @@ int of_flash_probe_gemini(struct platform_device *pdev, 


	return 0;

}
 
EXPORT_SYMBOL_GPL(of_flash_probe_gemini);

drivers/mtd/maps/physmap_of_versatile.c

+0 −1
Original line number Diff line number Diff line
@@ -252,4 +252,3 @@ int of_flash_probe_versatile(struct platform_device *pdev, 


	return 0;

}
 
EXPORT_SYMBOL_GPL(of_flash_probe_versatile);