summaryrefslogtreecommitdiff
path: root/include/sound/sh_dac_audio.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 14:29:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 14:29:03 +0300
commit90b45399b4418a3542fe096b92840b3bf235e78e (patch)
treea75e3e37503be4fe4c7d718248bd5a844c8705e1 /include/sound/sh_dac_audio.h
parente39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
downloadlinux-90b45399b4418a3542fe096b92840b3bf235e78e.tar.xz
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/sound/sh_dac_audio.h')
-rw-r--r--include/sound/sh_dac_audio.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/sound/sh_dac_audio.h b/include/sound/sh_dac_audio.h
index f5deaf1ddb9f..54f373e2ad54 100644
--- a/include/sound/sh_dac_audio.h
+++ b/include/sound/sh_dac_audio.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* SH_DAC specific configuration, for the dac_audio platform_device
*
* Copyright (C) 2009 Rafael Ignacio Zurita <rizurita@yahoo.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
*/
#ifndef __INCLUDE_SH_DAC_AUDIO_H