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: 56ff337ea4 ("mtd: physmap_of: add a hook for Gemini flash probing")
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Šī revīzija ir iekļauta:
Brian Norris
2017-02-08 18:09:37 -08:00
vecāks 42e9401bd1
revīzija 4f04f68e15
3 mainīti faili ar 6 papildinājumiem un 4 dzēšanām

Parādīt failu

@@ -115,4 +115,3 @@ int of_flash_probe_gemini(struct platform_device *pdev,
return 0;
}
EXPORT_SYMBOL_GPL(of_flash_probe_gemini);