From 5a44988207ee16b96e5445b8e95ab9881ce310cc Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 9 May 2012 16:39:00 +0300
Subject: [PATCH] mei: move doc files Documentation/misc-devices/mei
1. move mei.txt, TODO, and the example code under Documentation/misc-devices/mei
2. update the TODO file
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
Documentation/Makefile | 2 +-
Documentation/misc-devices/mei/Makefile | 8 ++++++++
Documentation/misc-devices/mei/TODO | 5 +++++
.../misc-devices}/mei/mei-amt-version.c | 0
{drivers/misc => Documentation/misc-devices}/mei/mei.txt | 0
drivers/misc/mei/TODO | 9 ---------
6 files changed, 14 insertions(+), 10 deletions(-)
create mode 100644 Documentation/misc-devices/mei/Makefile
create mode 100644 Documentation/misc-devices/mei/TODO
rename {drivers/misc => Documentation/misc-devices}/mei/mei-amt-version.c (100%)
rename {drivers/misc => Documentation/misc-devices}/mei/mei.txt (100%)
delete mode 100644 drivers/misc/mei/TODO
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 30b656ece7aae..31d302bc58630 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,3 +1,3 @@
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
- pcmcia/ spi/ timers/ watchdog/src/
+ pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/
diff --git a/Documentation/misc-devices/mei/Makefile b/Documentation/misc-devices/mei/Makefile
new file mode 100644
index 0000000000000..00e8c3e836ff6
--- /dev/null
+++ b/Documentation/misc-devices/mei/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# 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/Documentation/misc-devices/mei/TODO b/Documentation/misc-devices/mei/TODO
new file mode 100644
index 0000000000000..933b2999e19a6
--- /dev/null
+++ b/Documentation/misc-devices/mei/TODO
@@ -0,0 +1,5 @@
+TODO:
+ - Cleanup and split the timer function
+Upon Unstaging:
+ - Documentation/ioctl/ioctl-number.txt
+ - Updated MAINTAINERS
diff --git a/drivers/misc/mei/mei-amt-version.c b/Documentation/misc-devices/mei/mei-amt-version.c
similarity index 100%
rename from drivers/misc/mei/mei-amt-version.c
rename to Documentation/misc-devices/mei/mei-amt-version.c
diff --git a/drivers/misc/mei/mei.txt b/Documentation/misc-devices/mei/mei.txt
similarity index 100%
rename from drivers/misc/mei/mei.txt
rename to Documentation/misc-devices/mei/mei.txt
diff --git a/drivers/misc/mei/TODO b/drivers/misc/mei/TODO
deleted file mode 100644
index ed4d16c30ab52..0000000000000
--- a/drivers/misc/mei/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-TODO:
- - Cleanup and split the timer function
-Upon Unstaging:
- - Documentation/ioctl/ioctl-number.txt
- - move mei.txt under Documentation/mei/
- - move mei-amt-version.c under Documentation/mei
- - add hostprogs-y for mei-amt-version.c
- - drop mei_version.h
- - Updated MAINTAINERS
--
GitLab