diff options
| author |   Olof Johansson <olof@lixom.net> | 2019-01-04 14:30:36 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-01-04 14:31:38 -0800 |
| commit | 00f8ccd0c95f4e604297057a5bccec86c0903d14 (patch) | |
| tree | 3ef930b38f7341be627da106f6ec31a007c207e4 /include/linux/qcom_scm.h | |
| parent | ARM: multi_v7_defconfig: enable CONFIG_UNIPHIER_MDMAC (diff) | |
| parent | Merge tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers (diff) | |
| download | linux-dev-00f8ccd0c95f4e604297057a5bccec86c0903d14.tar.xz linux-dev-00f8ccd0c95f4e604297057a5bccec86c0903d14.zip | |
Merge branch 'next/drivers' into next/late
Merge in a few missing patches from the pull request (my copy of the
branch was behind the staged version in linux-next).
* next/drivers:
memory: pl353: Add driver for arm pl353 static memory controller
dt-bindings: memory: Add pl353 smc controller devicetree binding information
firmware: qcom: scm: fix compilation error when disabled
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/qcom_scm.h')
| -rw-r--r-- | include/linux/qcom_scm.h | 3 |
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) { |