commit a265f01218ee3aaa58c87a76ff8e63aab3747cd3
author Linux Build Service Account <lnxbuild@quicinc.com> Tue May 30 15:40:23 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 30 15:40:23 2017 -0700
tree 7febfe46aabd733499fad72c80cfd66fb181efac
parent f7b2ade896e67c2cf159f8b2bee942d4d6b496b2
parent 754d4c9c80f105035be25d3072078d0760f26858

Merge "scsi: ufs: Initiate crypto before SCSI for UFS fast boot" into msm-4.9

drivers/Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 990f63c..d0abb5a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -73,6 +73,7 @@
 obj-$(CONFIG_NUBUS)		+= nubus/
 obj-y				+= macintosh/
 obj-$(CONFIG_IDE)		+= ide/
+obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SCSI)		+= scsi/
 obj-y				+= nvme/
 obj-$(CONFIG_ATA)		+= ata/
@@ -131,7 +132,6 @@
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
 obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
-obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y				+= clocksource/