diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-07 21:00:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 21:00:14 +0300 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/net/wan/hd64570.c | |
| parent | 96524ea4be04683bb3ad8ebaedcbe3a6e34302de (diff) | |
| parent | 1e1d926369545ea09c98c6c7f5d109aa4ee0cd0b (diff) | |
| download | linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz | |
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/hd64570.c')
| -rw-r--r-- | drivers/net/wan/hd64570.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c index 166696d2c496..058e48182838 100644 --- a/drivers/net/wan/hd64570.c +++ b/drivers/net/wan/hd64570.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Hitachi SCA HD64570 driver for Linux * * Copyright (C) 1998-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. - * * Source of information: Hitachi HD64570 SCA User's Manual * * We use the following SCA memory map: |