aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-12-20 16:11:02 +0100
committerArnd Bergmann <arnd@arndb.de>2018-12-20 16:11:34 +0100
commit3e730e858139c3bed9587ca50ce0f2aa12fe9523 (patch)
tree6c47de7615a2f5b75ec4a8b15d2ecd646bcbe8dd
parent9f23b7ba6379fd80f0857cf4750e9eda83fe5408 (diff)
parent16ad9501b1f2edebe24f8cf3c09da0695871986b (diff)
downloadlinux-3e730e858139c3bed9587ca50ce0f2aa12fe9523.tar.gz
Merge tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Qualcomm ARM Based Driver Updates for v4.21 Part 2 - Redo * Fix SCM compilation error * tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: firmware: qcom: scm: fix compilation error when disabled Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--include/linux/qcom_scm.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index 06996ad4f2bc..1637385bcc17 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);
extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);
#else
+
+#include <linux/errno.h>
+
static inline
int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
{