diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2012-05-09 16:39:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-09 13:59:09 -0700 |
| commit | 5a44988207ee16b96e5445b8e95ab9881ce310cc (patch) | |
| tree | a248b08499d5a96e6f79b622e9bde3292d83809c | |
| parent | 4f3afe1d8c8e5dc41bb5820c01b4f3cfc2dc1205 (diff) | |
| download | linux-3.10-5a44988207ee16b96e5445b8e95ab9881ce310cc.tar.gz linux-3.10-5a44988207ee16b96e5445b8e95ab9881ce310cc.tar.bz2 linux-3.10-5a44988207ee16b96e5445b8e95ab9881ce310cc.zip | |
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>
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/misc-devices/mei/Makefile | 8 | ||||
| -rw-r--r-- | Documentation/misc-devices/mei/TODO | 5 | ||||
| -rw-r--r-- | Documentation/misc-devices/mei/mei-amt-version.c (renamed from drivers/misc/mei/mei-amt-version.c) | 0 | ||||
| -rw-r--r-- | Documentation/misc-devices/mei/mei.txt (renamed from drivers/misc/mei/mei.txt) | 0 | ||||
| -rw-r--r-- | drivers/misc/mei/TODO | 9 |
6 files changed, 14 insertions, 10 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 30b656ece7a..31d302bc586 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 00000000000..00e8c3e836f --- /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 00000000000..933b2999e19 --- /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 index 01804f21631..01804f21631 100644 --- a/drivers/misc/mei/mei-amt-version.c +++ b/Documentation/misc-devices/mei/mei-amt-version.c diff --git a/drivers/misc/mei/mei.txt b/Documentation/misc-devices/mei/mei.txt index 2785697da59..2785697da59 100644 --- a/drivers/misc/mei/mei.txt +++ b/Documentation/misc-devices/mei/mei.txt diff --git a/drivers/misc/mei/TODO b/drivers/misc/mei/TODO deleted file mode 100644 index ed4d16c30ab..00000000000 --- 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 |