diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 14:53:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 14:53:20 +0300 |
| commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
| tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /sound/soc/codecs/sigmadsp.h | |
| parent | 324e8f5f5d9d4d0b9a608b2fdb88cd93b0fbb12a (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz | |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/codecs/sigmadsp.h')
| -rw-r--r-- | sound/soc/codecs/sigmadsp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/sigmadsp.h b/sound/soc/codecs/sigmadsp.h index 614475cbb823..e3c9656e006d 100644 --- a/sound/soc/codecs/sigmadsp.h +++ b/sound/soc/codecs/sigmadsp.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Load firmware files from Analog Devices SigmaStudio * * Copyright 2009-2011 Analog Devices Inc. - * - * Licensed under the GPL-2 or later. */ #ifndef __SIGMA_FIRMWARE_H__ |