diff options
| author | Alex Deucher | 2019-06-25 15:42:25 +0200 |
|---|---|---|
| committer | Alex Deucher | 2019-06-25 15:42:25 +0200 |
| commit | d7929c1e13e3788e7cb741d75b5baec5e53eff21 (patch) | |
| tree | cf513071edfc4499b4e025e4846244c9d0e4c6bd /sound/soc/intel/atom/sst/sst_ipc.c | |
| parent | drm/amdgpu: disable gfxoff on navi10 (diff) | |
| parent | drm/edid: use for_each_displayid_db where applicable (diff) | |
| download | kernel-qcow2-linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.tar.gz kernel-qcow2-linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.tar.xz kernel-qcow2-linux-d7929c1e13e3788e7cb741d75b5baec5e53eff21.zip | |
Merge branch 'drm-next' into drm-next-5.3
Backmerge drm-next and fix up conflicts due to drmP.h removal.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'sound/soc/intel/atom/sst/sst_ipc.c')
| -rw-r--r-- | sound/soc/intel/atom/sst/sst_ipc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c index 20b01e02ed8f..c2851a829a64 100644 --- a/sound/soc/intel/atom/sst/sst_ipc.c +++ b/sound/soc/intel/atom/sst/sst_ipc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * sst_ipc.c - Intel SST Driver for audio engine * @@ -8,15 +9,6 @@ * KP Jeeja <jeeja.kp@intel.com> * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #include <linux/pci.h> |