diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-11 12:09:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-11 12:09:19 -0700 |
| commit | 6f75edeadd0dd3d58017bc3bcdc2b80879a7cfd3 (patch) | |
| tree | e75729deec3343feec7a19820fba633df4aea9b0 /drivers/hwspinlock/sirf_hwspinlock.c | |
| parent | ia64: disable CONFIG_PERFMON at least for now (diff) | |
| parent | hwspinlock/u8500: Switch to SPDX license identifier (diff) | |
| download | linux-dev-6f75edeadd0dd3d58017bc3bcdc2b80879a7cfd3.tar.xz linux-dev-6f75edeadd0dd3d58017bc3bcdc2b80879a7cfd3.zip | |
Merge tag 'hwlock-v4.18' of git://github.com/andersson/remoteproc
Pull hwspinlock updates from Bjorn Andersson:
"In addition to migrating the files to use SPDX license headers this
introduces the ability for clients to operate a hwlock without the
framework taking any additional locks"
* tag 'hwlock-v4.18' of git://github.com/andersson/remoteproc:
hwspinlock/u8500: Switch to SPDX license identifier
hwspinlock: sprd: Switch to SPDX license identifier
hwspinlock/sirf: Switch to SPDX license identifier
hwspinlock: qcom: Switch to SPDX license identifier
hwspinlock/omap: Switch to SPDX license identifier
hwspinlock/core: Switch to SPDX license identifier
hwspinlock: Introduce one new mode for hwspinlock
hwspinlock: Convert to use 'switch' statement
Diffstat (limited to 'drivers/hwspinlock/sirf_hwspinlock.c')
| -rw-r--r-- | drivers/hwspinlock/sirf_hwspinlock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c index cb38e487c6c4..1f625cd68c50 100644 --- a/drivers/hwspinlock/sirf_hwspinlock.c +++ b/drivers/hwspinlock/sirf_hwspinlock.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SIRF hardware spinlock driver * * Copyright (c) 2015 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2. */ #include <linux/kernel.h> |