diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
| commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
| tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /drivers/bcma | |
| parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
| parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/bcma/Makefile | 1 | ||||
| -rw-r--r-- | drivers/bcma/bcma_private.h | 1 | ||||
| -rw-r--r-- | drivers/bcma/scan.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig index 54f81c554815..a2df1ad03463 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 config BCMA_POSSIBLE bool depends on HAS_IOMEM && HAS_DMA diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile index 087948a1d20d..f8c37de35da2 100644 --- a/drivers/bcma/Makefile +++ b/drivers/bcma/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 bcma-y += main.o scan.o core.o sprom.o bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o bcma-y += driver_chipcommon_b.o diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index 168fa175d65a..a4aac370f21f 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef LINUX_BCMA_PRIVATE_H_ #define LINUX_BCMA_PRIVATE_H_ diff --git a/drivers/bcma/scan.h b/drivers/bcma/scan.h index 30eb475e4d19..e53079a3daf7 100644 --- a/drivers/bcma/scan.h +++ b/drivers/bcma/scan.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef BCMA_SCAN_H_ #define BCMA_SCAN_H_ |