diff options
author | David S. Miller <davem@davemloft.net> | 2019-06-07 20:00:14 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-06-07 20:00:14 +0200 |
commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /sound/soc/codecs/cx20442.h | |
parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/codecs/cx20442.h')
-rw-r--r-- | sound/soc/codecs/cx20442.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/cx20442.h b/sound/soc/codecs/cx20442.h index c7a7c79ef0cd..bb897bcb2486 100644 --- a/sound/soc/codecs/cx20442.h +++ b/sound/soc/codecs/cx20442.h @@ -1,13 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * cx20442.h -- audio driver for CX20442 * * Copyright 2009 Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> - * - * 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; either version 2 of the License, or (at your - * option) any later version. - * */ #ifndef _CX20442_CODEC_H |