Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a265f012 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents f7b2ade8 754d4c9c

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/ 
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_NEW_LEDS) += leds/ 
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/