diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-25 11:23:27 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-09-26 11:02:58 +0200 |
| commit | 19f94f97003a70a5241efff035f6c181c290a799 (patch) | |
| tree | 39dcdddf446379b45e8bc269f29e2ddfb5744b10 | |
| parent | 6ab0e475f1f38b6be90aff4ef3ebf928c4a73dc8 (diff) | |
v4l2-pci-skeleton: Only build if PCI is available
Currently arm64 does not support PCI but it does support v4l2. Since the
PCI skeleton driver is built unconditionally as a module with no dependency
on PCI this causes build failures for arm64 allmodconfig. Fix this by
defining a symbol VIDEO_PCI_SKELETON for the skeleton and conditionalising
the build on that.
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org> [added VIDEO dependencies]
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | Documentation/video4linux/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/Kconfig | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile index d58101e788fc..65a351d75c95 100644 --- a/Documentation/video4linux/Makefile +++ b/Documentation/video4linux/Makefile @@ -1 +1 @@ -obj-m := v4l2-pci-skeleton.o +obj-$(CONFIG_VIDEO_PCI_SKELETON) := v4l2-pci-skeleton.o diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index 9ca0f8d59a14..ba7e21a73023 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -25,6 +25,15 @@ config VIDEO_FIXED_MINOR_RANGES When in doubt, say N. +config VIDEO_PCI_SKELETON + tristate "Skeleton PCI V4L2 driver" + depends on PCI && BUILD_DOCSRC + depends on VIDEO_V4L2 && VIDEOBUF2_CORE + depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG + ---help--- + Enable build of the skeleton PCI driver, used as a reference + when developing new drivers. + # Used by drivers that need tuner.ko config VIDEO_TUNER tristate |