From patchwork Mon Apr 25 13:17:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102468 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1033999qge; Mon, 25 Apr 2016 06:19:52 -0700 (PDT) X-Received: by 10.98.32.13 with SMTP id g13mr5258846pfg.130.1461590391938; Mon, 25 Apr 2016 06:19:51 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 16si6779655pfi.41.2016.04.25.06.19.51; Mon, 25 Apr 2016 06:19:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932528AbcDYNTu (ORCPT + 4 others); Mon, 25 Apr 2016 09:19:50 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:63906 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932363AbcDYNTs (ORCPT ); Mon, 25 Apr 2016 09:19:48 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0M4miX-1beEu70W1V-00yzWE; Mon, 25 Apr 2016 15:19:30 +0200 From: Arnd Bergmann To: Michal Marek Cc: Nicolas Pitre , Rusty Russell , Arnd Bergmann , Jonathan Corbet , Mauro Carvalho Chehab , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 3/3] samples: v4l: from Documentation to samples directory Date: Mon, 25 Apr 2016 15:17:21 +0200 Message-Id: <1461590265-1397577-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461590265-1397577-1-git-send-email-arnd@arndb.de> References: <1461590265-1397577-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:2uavL3m4E0/InzLtLsQh+yZzRQPX5FV4RMgH3awtQoHJWfrinWP tztfrVEy9pa0jGWibhY+/30kQ+jwd4KJSDhL+koRScEnEDGMWXnI4hF02mqV9h706v5GUbr M9FirXgI0TIJkSxOBDQdT68sFzB+Lqo9pFF9ST1NolU1ECgZ41RweoOX6HIPqQlVEJgRKps lvuX0gIC0EmGB8Ggm30zg== X-UI-Out-Filterresults: notjunk:1; V01:K0:BdjiLOUg2u8=:WxVnn46wbjZ9w7PKb2std3 bUFLxs6fbYnO+SXcwoEWXFwK9IrnBoIOVVEeOyao0KIforoSOQo/pZQfP9Ocw7thA9BBHfScc rFa5bs+BSuHx7SQeh/6Lp05fJK/Y0Fu1fBYzf0lKzD9eSOamqkH4lV57yq/Ad4BXYlQv5/UV2 wcDe68tj12/eh5tTzsWr28hR/d6FhpbBQHmkgLWBnauNkggh4NwGeZE5UGFG7YpnF9K2nfO7S 69Psu1u4vawkGtLFT18RXHM60nmZZUwKtuqeLTf/YGdckJJNA/AROGp0Uf4FccMB18gUXJM6F ycBSmCkVxurOMhwV67T08C2ezx26OnCCeUT7mbQuwMi2fLKF9bd7odmum7GAJtpWmpKy65NGr ZKr/N93T+F+uYKk7xgpxZWE27IA61kUiJcEkNAdhevBN4YnxU7/iv/0fALBkKcAQ3pHP6rKVZ RaZKdnAhwUL0HUviucOhN8h0vXbk5Hamv2F71Pj4oZqwohspsJKqbwZ/CCi1DbaQctvHUpNXZ dMR2u6oDFNjjcQLiXRBj+0+9b94YdNi324q35xHLxjD1iQAiG/zySIJtaLOjJmM+AEOI5tQow n+thK9dYgwpiJ1lF9sg5HmS8AL+aFDypNvr9atZGsom1lWCaa4AuWiCgGaK4p+Zqug1thB/FO 41wwO3CyipSu+XPtzrM5dYNdF28ldeZ1XVmwaTTePBFLXOPnal+9/N3ikPceMzR6NlrQ= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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. Signed-off-by: Arnd Bergmann Fixes: 23121ca2b56b ("kbuild: create/adjust generated/autoksyms.h") --- Documentation/Makefile | 3 +-- Documentation/video4linux/v4l2-framework.txt | 2 +- samples/Makefile | 2 +- {Documentation/video4linux => samples/v4l}/Makefile | 0 {Documentation/video4linux => samples/v4l}/v4l2-pci-skeleton.c | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename {Documentation/video4linux => samples/v4l}/Makefile (100%) rename {Documentation/video4linux => samples/v4l}/v4l2-pci-skeleton.c (100%) -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/Makefile b/Documentation/Makefile index 13b5ae1b87aa..de955e151af8 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,4 +1,3 @@ subdir-y := accounting auxdisplay blackfin \ 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 594ef7d9fa2a..2e3b523d7097 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/ connector/ + configfs/ connector/ v4l/ diff --git a/Documentation/video4linux/Makefile b/samples/v4l/Makefile similarity index 100% rename from Documentation/video4linux/Makefile rename to samples/v4l/Makefile diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c similarity index 100% rename from Documentation/video4linux/v4l2-pci-skeleton.c rename to samples/v4l/v4l2-pci-skeleton.c