diff options
| -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 @@ subdir-y := accounting auxdisplay blackfin \ - laptops misc-devices pcmcia timers watchdog + 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 @@ -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 @@ -# List of programs to build -hostprogs-y := mei-amt-version -HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include -# Tell kbuild to always build the programs -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 F: drivers/misc/mei/* F: drivers/watchdog/mei_wdt.c F: Documentation/misc-devices/mei/* +F: samples/mei/* INTEL MIC DRIVERS (mic) 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 @@ +CC := $(CROSS_COMPILE)gcc +CFLAGS := -I../../usr/include + +PROGS := mei-amt-version + +all: $(PROGS) + +clean: + 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 |