Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933037AbcDYQDf (ORCPT ); Mon, 25 Apr 2016 12:03:35 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:54124 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932937AbcDYQD3 (ORCPT ); Mon, 25 Apr 2016 12:03:29 -0400 From: Arnd Bergmann To: Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-doc@vger.kernel.org, Jonathan Corbet , linux-kernel@vger.kernel.org, Andrew Morton , Arnd Bergmann Subject: [PATCH v2 2/2] samples: v4l: from Documentation to samples directory Date: Mon, 25 Apr 2016 18:03:09 +0200 Message-Id: <1461600189-2207716-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461600189-2207716-1-git-send-email-arnd@arndb.de> References: <1461600189-2207716-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:8vJURuTeU6/o9elRHQPsclL+DMkfDe9oNvmqHxGJ23xTECriLoS v+7NluCDE8YKuebjgfJiOUl47ZC7ZhbeHcbioNKPMLkogj6Ey+TaYr9++G23Wt1iql1EGtT iO02HuOUuiqM5VvyGOvKZSyGZpp+M2Z+WVyz0Luk1s4JrwL9uwhJsV4rX/U+Owlp9Kt5O8W g+/AqmWUc4ay/6A2UU+2A== X-UI-Out-Filterresults: notjunk:1;V01:K0:k0eeiP3RF/4=:mHypnqx199Ikm8RIUlhxoH J4Tws/nmBXxTTlsBUoGYoPfgrIBlZNyA8EYZyetvjuQrxXYrQcAA3My1Ni7zYi7HhX6Ticvgi Kq+ADaGHMnDssUZ+W0iJcpcXLd0l+HRYS5HrX6YkpYO8bGkn8hmRQ/6vnwCVCM7kOmLE95uuS 8aqqv3EEhtK00Wf/tZyuhJQR0n1POH2+NacSJWIdjmOuTX8IFuxYueHe7bAgUoBzwJzGMgEtq M5BYQUz6QzsXBz6B+UB6tEelEfvSaYW7F/7Jkiex0NoFBzy/tAtutcoQZQufXXXsIgWkVPbgl 3oFVeoMnUY4BbsQgwgnjavN+4VR+2rHbrWKTS4OX/mc25PYoCu1wVX9d/Z847WMZXtDpcJLte vvOu/NciXFVBlPufPQlLJ9WOmuj8tCTF+n3mf8EaSpdOupjH6UlBTR8rXMwVau6mG2/vpnxFJ 44wO1MR8+6wk4TGNAyir0njhHVlVXqE9OGX73/hrHRO/3ugWxjqmXIiApXQeqNDGbJDLsguV2 X7d++gCFxSSjAoCsrd5QgG1HPhrKIYj7HAPYDtlrV49d6T2DQddfp7Dczu3Xk7fkWpeI463ek lvc1zqt/9R3O1B2ZCwlTPgeMsbSu2HOGLOQh4qktpAjlfkxoCt6uaoCDRW+RV1QiDHBN/UzZV ggoaIw5WsoWFlpzw3nZmEUBtofGgEBKqgnaP95sDC9/xYUndYe4KI8soFffdJ16ZEfRQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2885 Lines: 63 A small bug with the new autoksyms support showed that there are two kernel modules in the Documentation directory that qualify as samples, while all other samples are in the samples/ directory. This patch was originally meant as a workaround for that bug, but it has now been solved in a different way. However, I still think it makes sense as a cleanup to consolidate all sample code in one place. Signed-off-by: Arnd Bergmann --- 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%) 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 -- 2.7.0