Commit 3e730e85 authored Dec 20, 2018 by Arnd Bergmann

Merge tag 'qcom-drivers-for-4.21-2' of...

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>

parents 9f23b7ba 16ad9501

include/linux/qcom_scm.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{