git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
qcom_defconfig
diff --git
a/arch/arm/configs/qcom_defconfig
b/arch/arm/configs/qcom_defconfig
index 6aa7046fb91ffeba3e67ab481e730da1ec8e8fa4..bd6440f234939eb450cd47af85e292429eaf0821 100644
(file)
--- a/
arch/arm/configs/qcom_defconfig
+++ b/
arch/arm/configs/qcom_defconfig
@@
-207,6
+207,7
@@
CONFIG_MSM_MMCC_8974=y
CONFIG_MSM_IOMMU=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK_QCOM=y
+CONFIG_MAILBOX=y
CONFIG_REMOTEPROC=y
CONFIG_QCOM_ADSP_PIL=y
CONFIG_QCOM_Q6V5_PIL=y