summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-19 03:21:41 (GMT)
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 05:29:27 (GMT)
commit141e380d69ee0b7b530a92e95eeb612d6656044b (patch)
tree4de2e3b094c831c8f0b0d6141acb44ae76ae4317
parent3e1143611c847e92fc2254b831f6d97f5dbf9fd2 (diff)
downloadlinux-3.10-141e380d69ee0b7b530a92e95eeb612d6656044b.zip
linux-3.10-141e380d69ee0b7b530a92e95eeb612d6656044b.tar.gz
linux-3.10-141e380d69ee0b7b530a92e95eeb612d6656044b.tar.bz2
phy: exynos: fix building as a module
The top-level phy-samsung-usb2 driver may be configured as a loadable module, which currently causes link errors because of the dependency on the exynos{5250,4x12,4210}_usb2_phy_config symbol. Solving this could be achieved by exporting these symbols, but as the SoC-specific parts of the driver are not currently built as modules, it seems better to just link everything into one module and avoid the need for the export. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [backport from upstream commit d1481832f1dbb9d10fab27269631a130fa082f03] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: I07f3a7ee523c55fab023b6c03caa6fba31bdec9b
-rw-r--r--drivers/phy/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 3f8638d..f20b8bb 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_GENERIC_PHY) += phy-core.o
obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
obj-$(CONFIG_EXYNOS_PHY) += exynos-phy.o
-obj-$(CONFIG_PHY_SAMSUNG_USB2) += phy-samsung-usb2.o
-obj-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
-obj-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o
+obj-$(CONFIG_PHY_SAMSUNG_USB2) += phy-exynos-usb2.o
+phy-exynos-usb2-y += phy-samsung-usb2.o
+phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
+phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o