github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: soc: qcom: rpmh: fix bad merge resolution

Browse Source 
... between commit cd49f10d96 ("FROMLIST: soc: qcom: rpmh: Allow RPMH
driver to be loaded as a module") and upstream commit 681b091238
("soc: qcom: rpmh: Allow RPMH on ARM SoC").

Fixes: 075d0ec13d ("Merge c0842fbc1b ("random32: move the pseudo-random 32-bit definitions to prandom.h") into android-mainline")
Cc: John Stultz <john.stultz@linaro.org>
Change-Id: Ida0fefa19bba5f291218ffa794a095b41599d48e
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2020-08-11 15:44:11 -07:00 committed by Greg Kroah-Hartman
parent 57593f3bc9
commit ab8e3215a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/qcom/Kconfig
View File

@ -93,7 +93,7 @@ config QCOM_RMTFS_MEM
config QCOM_RPMH
tristate "Qualcomm RPM-Hardened (RPMH) Communication"
depends on ARCH_QCOM && ARM64 || COMPILE_TEST
depends on ARCH_QCOM || COMPILE_TEST
help
Support for communication with the hardened-RPM blocks in
Qualcomm Technologies Inc (QTI) SoCs. RPMH communication uses an