summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-04-25 10:17:21 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-05-09 18:34:37 -0300
commit0185f850176201260e0f02c5bccca1defb8e0884 (patch)
tree18a0c368c5a56601fcc8c13a6b12a2f1218e0150
parentec788795dde419af4935c3c9d08d641707114eec (diff)
downloadlinux-0185f850176201260e0f02c5bccca1defb8e0884.tar.gz
linux-0185f850176201260e0f02c5bccca1defb8e0884.tar.bz2
linux-0185f850176201260e0f02c5bccca1defb8e0884.zip
[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: 23121ca2b56b ("kbuild: create/adjust generated/autoksyms.h") Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--Documentation/Makefile3
-rw-r--r--Documentation/video4linux/v4l2-framework.txt2
-rw-r--r--samples/Makefile2
-rw-r--r--samples/v4l/Makefile (renamed from Documentation/video4linux/Makefile)0
-rw-r--r--samples/v4l/v4l2-pci-skeleton.c (renamed from Documentation/video4linux/v4l2-pci-skeleton.c)0
5 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 1207d7907650..f3b04d22957c 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,4 +1,3 @@
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
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index fa41608ab2b4..cbefc7902f5f 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -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.
diff --git a/samples/Makefile b/samples/Makefile
index 48001d7e23f0..ad440d670cdb 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -2,4 +2,4 @@
obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \
hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
- configfs/
+ configfs/ v4l/
diff --git a/Documentation/video4linux/Makefile b/samples/v4l/Makefile
index 65a351d75c95..65a351d75c95 100644
--- a/Documentation/video4linux/Makefile
+++ b/samples/v4l/Makefile
diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
index a55cf94ac907..a55cf94ac907 100644
--- a/Documentation/video4linux/v4l2-pci-skeleton.c
+++ b/samples/v4l/v4l2-pci-skeleton.c