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 /arch/mips/emma/common/Makefile | |
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 'arch/mips/emma/common/Makefile')
-rw-r--r-- | arch/mips/emma/common/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/emma/common/Makefile b/arch/mips/emma/common/Makefile index f27d84d1904f..a754abd1beb9 100644 --- a/arch/mips/emma/common/Makefile +++ b/arch/mips/emma/common/Makefile @@ -1,10 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) NEC Electronics Corporation 2005-2006 # -# 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. -# obj-$(CONFIG_NEC_MARKEINS) += prom.o |