diff options
author | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-16 18:07:20 -0400 |
---|---|---|
committer | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-23 13:51:43 -0400 |
commit | 986b891ad121c61200d3dffcc8ed128a1397682e (patch) | |
tree | f3c01c12a1a30c6039d63cb7b9173c0dc9b653c5 | |
parent | 6bee835dd54e279f3d3ae2eca92a9c394b4fd028 (diff) |
samples: move misc-devices/mei example code from Documentation
Move misc-devices/mei examples to samples/mei and remove it from
Documentation Makefile. Delete misc-devices/Makefile.
Create a new Makefile to build samples/mei. It can be built from top
level directory or from mei directory:
Run make -C samples/mei or cd samples/mei; make
Acked-by: Jonathan Corbet <corbet@lwn.net>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
-rw-r--r-- | Documentation/Makefile | 2 | ||||
-rw-r--r-- | Documentation/misc-devices/Makefile | 1 | ||||
-rw-r--r-- | Documentation/misc-devices/mei/Makefile | 5 | ||||
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | samples/mei/.gitignore (renamed from Documentation/misc-devices/mei/.gitignore) | 0 | ||||
-rw-r--r-- | samples/mei/Makefile | 9 | ||||
-rw-r--r-- | samples/mei/TODO (renamed from Documentation/misc-devices/mei/TODO) | 0 | ||||
-rw-r--r-- | samples/mei/mei-amt-version.c (renamed from Documentation/misc-devices/mei/mei-amt-version.c) | 0 |
8 files changed, 11 insertions, 7 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 80b5bdc65055..3c2a207a7c40 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile | |||
@@ -1,2 +1,2 @@ | |||
1 | subdir-y := accounting auxdisplay blackfin \ | 1 | subdir-y := accounting auxdisplay blackfin \ |
2 | laptops misc-devices pcmcia timers watchdog | 2 | laptops pcmcia timers watchdog |
diff --git a/Documentation/misc-devices/Makefile b/Documentation/misc-devices/Makefile deleted file mode 100644 index e2b7aa4c9e21..000000000000 --- a/Documentation/misc-devices/Makefile +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | subdir-y := mei | ||
diff --git a/Documentation/misc-devices/mei/Makefile b/Documentation/misc-devices/mei/Makefile deleted file mode 100644 index d758047d1b6d..000000000000 --- a/Documentation/misc-devices/mei/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # List of programs to build | ||
2 | hostprogs-y := mei-amt-version | ||
3 | HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include | ||
4 | # Tell kbuild to always build the programs | ||
5 | always := $(hostprogs-y) | ||
diff --git a/MAINTAINERS b/MAINTAINERS index 20bb1d00098c..b76872ace843 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6244,6 +6244,7 @@ F: include/linux/mei_cl_bus.h | |||
6244 | F: drivers/misc/mei/* | 6244 | F: drivers/misc/mei/* |
6245 | F: drivers/watchdog/mei_wdt.c | 6245 | F: drivers/watchdog/mei_wdt.c |
6246 | F: Documentation/misc-devices/mei/* | 6246 | F: Documentation/misc-devices/mei/* |
6247 | F: samples/mei/* | ||
6247 | 6248 | ||
6248 | INTEL MIC DRIVERS (mic) | 6249 | INTEL MIC DRIVERS (mic) |
6249 | M: Sudeep Dutt <sudeep.dutt@intel.com> | 6250 | M: Sudeep Dutt <sudeep.dutt@intel.com> |
diff --git a/Documentation/misc-devices/mei/.gitignore b/samples/mei/.gitignore index f356b81ca1ec..f356b81ca1ec 100644 --- a/Documentation/misc-devices/mei/.gitignore +++ b/samples/mei/.gitignore | |||
diff --git a/samples/mei/Makefile b/samples/mei/Makefile new file mode 100644 index 000000000000..7aac216dc420 --- /dev/null +++ b/samples/mei/Makefile | |||
@@ -0,0 +1,9 @@ | |||
1 | CC := $(CROSS_COMPILE)gcc | ||
2 | CFLAGS := -I../../usr/include | ||
3 | |||
4 | PROGS := mei-amt-version | ||
5 | |||
6 | all: $(PROGS) | ||
7 | |||
8 | clean: | ||
9 | rm -fr $(PROGS) | ||
diff --git a/Documentation/misc-devices/mei/TODO b/samples/mei/TODO index 6b3625d3058c..6b3625d3058c 100644 --- a/Documentation/misc-devices/mei/TODO +++ b/samples/mei/TODO | |||
diff --git a/Documentation/misc-devices/mei/mei-amt-version.c b/samples/mei/mei-amt-version.c index 57d0d871dcf7..57d0d871dcf7 100644 --- a/Documentation/misc-devices/mei/mei-amt-version.c +++ b/samples/mei/mei-amt-version.c | |||