summaryrefslogtreecommitdiffstats
path: root/drivers/hsi/clients/Makefile
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2014-05-06 15:44:50 +0200
committerSebastian Reichel <sre@kernel.org>2014-05-06 15:44:50 +0200
commit695f5ec02203ef23f127eacb86991d23307f3c6f (patch)
treeecb9c29268fa34559dfa06472d991bc5d92708be /drivers/hsi/clients/Makefile
parent5bdeae302496a8ac49848f4fed26b1d87a67d966 (diff)
parent793ec5f7dccf95c0d6d5d57a925a13261a7cbd2b (diff)
downloadlinux-695f5ec02203ef23f127eacb86991d23307f3c6f.tar.bz2
Merge branch 'n900-modem-support' into n900-dt-with-ssin900-dt-with-ssi
Conflicts: arch/arm/boot/dts/omap3-n900.dts
Diffstat (limited to 'drivers/hsi/clients/Makefile')
-rw-r--r--drivers/hsi/clients/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hsi/clients/Makefile b/drivers/hsi/clients/Makefile
index 327c0e27c8b0..4d5bc0e0b27b 100644
--- a/drivers/hsi/clients/Makefile
+++ b/drivers/hsi/clients/Makefile
@@ -2,4 +2,6 @@
# Makefile for HSI clients
#
-obj-$(CONFIG_HSI_CHAR) += hsi_char.o
+obj-$(CONFIG_NOKIA_MODEM) += nokia-modem.o
+obj-$(CONFIG_SSI_PROTOCOL) += ssi_protocol.o
+obj-$(CONFIG_HSI_CHAR) += hsi_char.o