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/crypto/ux500/cryp/Makefile | |
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/crypto/ux500/cryp/Makefile')
-rw-r--r-- | drivers/crypto/ux500/cryp/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/ux500/cryp/Makefile b/drivers/crypto/ux500/cryp/Makefile index dc8fff29c4b3..3e67531f484c 100644 --- a/drivers/crypto/ux500/cryp/Makefile +++ b/drivers/crypto/ux500/cryp/Makefile @@ -1,7 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only #/* # * Copyright (C) ST-Ericsson SA 2010 # * Author: shujuan.chen@stericsson.com for ST-Ericsson. -# * License terms: GNU General Public License (GPL) version 2 */ +# */ ccflags-$(CONFIG_CRYPTO_DEV_UX500_DEBUG) += -DDEBUG |