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/firmware/imx/sci.h | |
| parent | 8e564895c30ca73cd9788aecb845879ddee987c3 (diff) | |
| parent | 3e730e858139c3bed9587ca50ce0f2aa12fe9523 (diff) | |
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/firmware/imx/sci.h')
| -rw-r--r-- | include/linux/firmware/imx/sci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/firmware/imx/sci.h b/include/linux/firmware/imx/sci.h index 29ada609de03..ebc55098faee 100644 --- a/include/linux/firmware/imx/sci.h +++ b/include/linux/firmware/imx/sci.h @@ -14,4 +14,5 @@ #include <linux/firmware/imx/types.h> #include <linux/firmware/imx/svc/misc.h> +#include <linux/firmware/imx/svc/pm.h> #endif /* _SC_SCI_H */ |