summaryrefslogtreecommitdiffstats
path: root/drivers/hsi/controllers/Makefile
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2016-04-30 03:24:09 +0200
committerSebastian Reichel <sre@kernel.org>2016-05-02 21:56:21 +0200
commit0fae198988b873d30fe9ecb6a6271afb36df97e9 (patch)
tree8799cca9edc3e06c29882b64321aa2c2da255bc0 /drivers/hsi/controllers/Makefile
parentHSI: omap_ssi: fix removal of port platform device (diff)
downloadlinux-0fae198988b873d30fe9ecb6a6271afb36df97e9.tar.xz
linux-0fae198988b873d30fe9ecb6a6271afb36df97e9.zip
HSI: omap_ssi: built omap_ssi and omap_ssi_port into one module
Merge omap_ssi and omap_ssi_port into one module. This fixes problems with module cycle dependencies introduced by future patches. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/hsi/controllers/Makefile')
-rw-r--r--drivers/hsi/controllers/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hsi/controllers/Makefile b/drivers/hsi/controllers/Makefile
index d2665cf9c545..7aba9c7f71bb 100644
--- a/drivers/hsi/controllers/Makefile
+++ b/drivers/hsi/controllers/Makefile
@@ -2,5 +2,5 @@
# Makefile for HSI controllers drivers
#
-obj-$(CONFIG_OMAP_SSI) += omap_ssi.o
-obj-$(CONFIG_OMAP_SSI_PORT) += omap_ssi_port.o
+omap_ssi-objs += omap_ssi_core.o omap_ssi_port.o
+obj-$(CONFIG_OMAP_SSI) += omap_ssi.o