diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-21 06:44:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-21 06:44:54 -0800 |
| commit | e4401d0ea1c7123ae851a41da57c95dfd8771116 (patch) | |
| tree | 54a1a51b8f6b588bfa2177ae9cdd10fbc25f402e /drivers/soc | |
| parent | a0f8e2a9d6d460fcaf5e75d4970929fc9867a0ec (diff) | |
| parent | b8a78b95aee6873471ddb59d2ca74810b7cad09e (diff) | |
Merge "audio: ion: switch to msm ion on gvm."
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c b/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c index a3aa8823d8ce..afc40461e8e8 100644 --- a/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c +++ b/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c @@ -22,7 +22,6 @@ #include <linux/msm_audio_ion.h> #include <linux/habmm.h> #include "../../../staging/android/ion/ion_priv.h" -#include "../../../staging/android/ion/ion_hvenv_driver.h" #define MSM_AUDIO_ION_PROBED (1 << 0) @@ -628,7 +627,7 @@ struct ion_client *msm_audio_ion_client_create(const char *name) { struct ion_client *pclient = NULL; - pclient = hvenv_ion_client_create(name); + pclient = msm_ion_client_create(name); return pclient; } |