Merge changes I3c3e0f41,I1dc09c32 into audio-drivers.lnx.5.0

* changes:
  ASoC: update uapi header location
  dsp: update ion alloc header file
This commit is contained in:
Linux Build Service Account 2020-01-02 15:20:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1599fbce86
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2013-2014, 2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2014, 2017, 2019 The Linux Foundation. All rights reserved.
*/
#ifndef _MSM_DS2_DAP_CONFIG_H_
@ -9,7 +9,7 @@
#include <sound/soc.h>
#include "msm-dolby-common.h"
#include <sound/hwdep.h>
#include <uapi/sound/devdep_params.h>
#include <uapi/audio/sound/devdep_params.h>
#ifdef CONFIG_COMPAT
struct dolby_param_data32 {

View file

@ -16,7 +16,7 @@
#include <linux/platform_device.h>
#include <linux/of_device.h>
#include <linux/export.h>
#include <linux/ion_kernel.h>
#include <linux/ion.h>
#include <ipc/apr.h>
#include <dsp/msm_audio_ion.h>