diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 18:03:08 +0200 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2016-04-28 07:47:35 -0600 |
commit | 14fbff6b4e48a529c90e771598ac12bffd445ff4 (patch) | |
tree | ebbd42b6baecbba583bf00410b6c75be09b96f4c /samples | |
parent | Documentation: xillybus: fix spelling mistake (diff) | |
download | linux-dev-14fbff6b4e48a529c90e771598ac12bffd445ff4.tar.xz linux-dev-14fbff6b4e48a529c90e771598ac12bffd445ff4.zip |
samples: connector: from Documentation to samples directory
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 <arnd@arndb.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to '')
-rw-r--r-- | samples/Kconfig | 9 | ||||
-rw-r--r-- | samples/Makefile | 2 | ||||
-rw-r--r-- | samples/connector/.gitignore (renamed from Documentation/connector/.gitignore) | 0 | ||||
-rw-r--r-- | samples/connector/Makefile (renamed from Documentation/connector/Makefile) | 6 | ||||
-rw-r--r-- | samples/connector/cn_test.c (renamed from Documentation/connector/cn_test.c) | 0 | ||||
-rw-r--r-- | samples/connector/ucon.c (renamed from Documentation/connector/ucon.c) | 0 |
6 files changed, 13 insertions, 4 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index d54f28c6dc5e..559a58baff6e 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -76,4 +76,13 @@ config SAMPLE_CONFIGFS help Builds a sample configfs interface. +config SAMPLE_CONNECTOR + tristate "Build connector sample -- loadable modules only" + depends on CONNECTOR && m + help + When enabled, this builds both a sample kernel module for + the connector interface and a user space tool to communicate + with it. + See also Documentation/connector/connector.txt + endif # SAMPLES diff --git a/samples/Makefile b/samples/Makefile index 48001d7e23f0..594ef7d9fa2a 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/ connector/ diff --git a/Documentation/connector/.gitignore b/samples/connector/.gitignore index d2b9c32accd4..d2b9c32accd4 100644 --- a/Documentation/connector/.gitignore +++ b/samples/connector/.gitignore diff --git a/Documentation/connector/Makefile b/samples/connector/Makefile index d98e4df98e24..04b9622b6f51 100644 --- a/Documentation/connector/Makefile +++ b/samples/connector/Makefile @@ -1,9 +1,9 @@ -ifneq ($(CONFIG_CONNECTOR),) -obj-m += cn_test.o -endif +obj-$(CONFIG_SAMPLE_CONNECTOR) += cn_test.o # List of programs to build +ifdef CONFIG_SAMPLE_CONNECTOR hostprogs-y := ucon +endif # Tell kbuild to always build the programs always := $(hostprogs-y) diff --git a/Documentation/connector/cn_test.c b/samples/connector/cn_test.c index d12cc944b696..d12cc944b696 100644 --- a/Documentation/connector/cn_test.c +++ b/samples/connector/cn_test.c diff --git a/Documentation/connector/ucon.c b/samples/connector/ucon.c index 8a4da64e02a8..8a4da64e02a8 100644 --- a/Documentation/connector/ucon.c +++ b/samples/connector/ucon.c |