diff options
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 |