diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-29 09:12:34 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-29 09:12:34 +0300 |
| commit | 97ec37c57dd411d0815455bca07166411c0da1df (patch) | |
| tree | d64850c43778d15c137772957788093a8b7d032c /include/linux/qcom_scm.h | |
| parent | ace6485a03266cc3c198ce8e927a1ce0ce139699 (diff) | |
| parent | b59dfdaef173677b0b7e10f375226c0a1114fd20 (diff) | |
| download | linux-97ec37c57dd411d0815455bca07166411c0da1df.tar.xz | |
Merge branch 'linus' into x86/urgent, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/qcom_scm.h')
| -rw-r--r-- | include/linux/qcom_scm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h index 5d65521260b3..06996ad4f2bc 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2015, 2018, The Linux Foundation. All rights reserved. * Copyright (C) 2015 Linaro Ltd. * * This program is free software; you can redistribute it and/or modify @@ -33,6 +33,8 @@ struct qcom_scm_vmperm { #define QCOM_SCM_VMID_HLOS 0x3 #define QCOM_SCM_VMID_MSS_MSA 0xF +#define QCOM_SCM_VMID_WLAN 0x18 +#define QCOM_SCM_VMID_WLAN_CE 0x19 #define QCOM_SCM_PERM_READ 0x4 #define QCOM_SCM_PERM_WRITE 0x2 #define QCOM_SCM_PERM_EXEC 0x1 |