diff options
author | David S. Miller | 2019-06-07 20:00:14 +0200 |
---|---|---|
committer | David S. Miller | 2019-06-07 20:00:14 +0200 |
commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /arch/powerpc/platforms/embedded6xx/mvme5100.c | |
parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz kernel-qcow2-linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz kernel-qcow2-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 'arch/powerpc/platforms/embedded6xx/mvme5100.c')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/mvme5100.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c index 273dfa3f0252..1cd488daa0bf 100644 --- a/arch/powerpc/platforms/embedded6xx/mvme5100.c +++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board setup routines for the Motorola/Emerson MVME5100. * @@ -8,13 +9,7 @@ * Matt Porter, MontaVista Software Inc. * Copyright 2001 MontaVista Software Inc. * - * 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. - * * Author: Stephen Chivers <schivers@csc.com> - * */ #include <linux/of_platform.h> |