Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0185f850 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

[media] samples: v4l: from Documentation to samples directory 



With the new autoksyms support, we can run into a situation where
the v4l pci skeleton module is the only one using some exported
symbols that get dropped because they are never referenced by
the kernel otherwise, causing a build problem:

ERROR: "vb2_dma_contig_memops" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "vb2_dma_contig_init_ctx_attrs" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_match_dv_timings" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_find_dv_timings_cap" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_valid_dv_timings" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "v4l2_enum_dv_timings_cap" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!
ERROR: "vb2_dma_contig_cleanup_ctx" [Documentation/video4linux/v4l2-pci-skeleton.ko] undefined!

Specifically, we do look in the samples directory for users of
symbols, but not the Documentation directory.

This solves the build problem by moving the connector sample into
the same directory as the other samples.

Fixes: 23121ca2 ("kbuild: create/adjust generated/autoksyms.h")

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ec788795

Documentation/Makefile

+1 −2
Original line number Diff line number Diff line 
subdir-y := accounting auxdisplay blackfin connector \

	filesystems filesystems ia64 laptops mic misc-devices \

	networking pcmcia prctl ptp timers vDSO video4linux \

	watchdog
 
	networking pcmcia prctl ptp timers vDSO watchdog

Documentation/video4linux/v4l2-framework.txt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ need and this same framework should make it much easier to refactor 
common code into utility functions shared by all drivers.



A good example to look at as a reference is the v4l2-pci-skeleton.c

source that is available in this directory. It is a skeleton driver for

source that is available in samples/v4l/. It is a skeleton driver for

a PCI capture card, and demonstrates how to use the V4L2 driver

framework. It can be used as a template for real PCI video capture driver.

samples/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 


obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \

			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \

			   configfs/
 
			   configfs/ v4l/