summaryrefslogtreecommitdiff
path: root/drivers/crypto/cavium/nitrox/nitrox_hal.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-04 08:53:04 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-04 08:53:04 +0100
commit649e441f49d4bfb717e9467950891dc452f4e063 (patch)
tree2bdfdca65519db2f350c236cbbd65f24d5746cad /drivers/crypto/cavium/nitrox/nitrox_hal.c
parent42f930da7f00c0ab23df4c7aed36137f35988980 (diff)
parent5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff)
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/crypto/cavium/nitrox/nitrox_hal.c')
-rw-r--r--drivers/crypto/cavium/nitrox/nitrox_hal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/cavium/nitrox/nitrox_hal.c b/drivers/crypto/cavium/nitrox/nitrox_hal.c
index f0655f82fa7d..bf9900bc4804 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_hal.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_hal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include <linux/delay.h>
#include "nitrox_dev.h"