Merge "audio: ion: switch to msm ion on gvm." (e4401d0e) · Commits · e / devices / android_kernel_sony_msm8998

drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}