Commit ab8e3215 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

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



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

Fixes: 075d0ec1 ("Merge c0842fbc ("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: default avatarEric Biggers <ebiggers@google.com>
parent 57593f3b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment