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 /drivers/net/wan/wanxl.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 'drivers/net/wan/wanxl.h')
-rw-r--r-- | drivers/net/wan/wanxl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wan/wanxl.h b/drivers/net/wan/wanxl.h index 3f86558f8a6b..0b0198bf2351 100644 --- a/drivers/net/wan/wanxl.h +++ b/drivers/net/wan/wanxl.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * wanXL serial card driver for Linux * definitions common to host driver and card firmware * * Copyright (C) 2003 Krzysztof Halasa <khc@pm.waw.pl> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License - * as published by the Free Software Foundation. */ #define RESET_WHILE_LOADING 0 |