summaryrefslogtreecommitdiff
path: root/drivers/firmware/Makefile
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-10-22 17:22:09 +0300
committerRob Herring <robh@kernel.org>2015-10-22 17:22:09 +0300
commitf92ce7618f0cb0ced87ea1cfe994d2e8473c61b4 (patch)
tree8589e85799e0de7b1cdf0b4e8f08397eeeb72a74 /drivers/firmware/Makefile
parent307751ee3212df0d047b0e1a93ce21f2e511d1a1 (diff)
parenteb3fcf007fffe5830d815e713591f3e858f2a365 (diff)
downloadlinux-f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4.tar.xz
Merge branch 'dt-doc-cleanup' into for-next
Diffstat (limited to 'drivers/firmware/Makefile')
-rw-r--r--drivers/firmware/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 000830fc6707..2ee83474a3c1 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -13,7 +13,8 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
obj-$(CONFIG_QCOM_SCM) += qcom_scm.o
-obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o
+obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o
+obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o
CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
obj-y += broadcom/