diff options
| author | James Morris | 2019-01-22 14:33:10 -0800 |
|---|---|---|
| committer | James Morris | 2019-01-22 14:33:10 -0800 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /include/linux/qcom_scm.h | |
| parent | 3e8c73671244af16f1a6042f1c10d13b75cd1156 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'include/linux/qcom_scm.h')
| -rw-r--r-- | include/linux/qcom_scm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h index 1637385bcc17..d0aecc04c54b 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -13,6 +13,7 @@ #ifndef __QCOM_SCM_H #define __QCOM_SCM_H +#include <linux/err.h> #include <linux/types.h> #include <linux/cpumask.h> |