diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:48:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:48:05 +0100 |
| commit | 783711f0d2458ca1bd716000e767c478cef27144 (patch) | |
| tree | 0aebe2cfc09cbfa9a18e6a5e8d002489745f45a8 /drivers/media/platform/vivid/Makefile | |
| parent | objtool: Print top level commands on incorrect usage (diff) | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-783711f0d2458ca1bd716000e767c478cef27144.tar.xz linux-783711f0d2458ca1bd716000e767c478cef27144.zip | |
Merge branch 'linus' into core/objtool, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/platform/vivid/Makefile')
| -rw-r--r-- | drivers/media/platform/vivid/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/vivid/Makefile b/drivers/media/platform/vivid/Makefile index 29738810e3ee..2f5762e3309a 100644 --- a/drivers/media/platform/vivid/Makefile +++ b/drivers/media/platform/vivid/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ |