diff options
author | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-21 18:34:55 -0400 |
---|---|---|
committer | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-23 15:07:21 -0400 |
commit | 3ca9760fdfa411f7e5db54b3437fbb858d2ec825 (patch) | |
tree | 8a2839309295a8e982544ee3f151d854916d97e7 | |
parent | d522b2cdfed853e372d6b64a89d070368f0718f7 (diff) |
tools: move laptops dslm tool from Documentation
Move laptops dslm tool to tools/laptop/dslm and remove it from
Documentation Makefile. Update location information for this
tool. Create a new Makefile to build dslm. It can be built
from top level directory or from laptops directory:
Run make -C tools/laptop/dslm or cd tools/laptop/dslm; make
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
-rw-r--r-- | Documentation/Makefile | 2 | ||||
-rw-r--r-- | Documentation/laptops/00-INDEX | 4 | ||||
-rw-r--r-- | Documentation/laptops/Makefile | 5 | ||||
-rw-r--r-- | Documentation/laptops/laptop-mode.txt | 2 | ||||
-rw-r--r-- | tools/laptop/dslm/.gitignore (renamed from Documentation/laptops/.gitignore) | 0 | ||||
-rw-r--r-- | tools/laptop/dslm/Makefile | 9 | ||||
-rw-r--r-- | tools/laptop/dslm/dslm.c (renamed from Documentation/laptops/dslm.c) | 0 |
7 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index e4dd5e4614a4..0ddb50c3cfc4 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile | |||
@@ -1,2 +1,2 @@ | |||
1 | subdir-y := blackfin \ | 1 | subdir-y := blackfin \ |
2 | laptops pcmcia | 2 | pcmcia |
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX index 7c0ac2a26b9e..86169dc766f7 100644 --- a/Documentation/laptops/00-INDEX +++ b/Documentation/laptops/00-INDEX | |||
@@ -1,13 +1,9 @@ | |||
1 | 00-INDEX | 1 | 00-INDEX |
2 | - This file | 2 | - This file |
3 | Makefile | ||
4 | - Makefile for building dslm example program. | ||
5 | asus-laptop.txt | 3 | asus-laptop.txt |
6 | - information on the Asus Laptop Extras driver. | 4 | - information on the Asus Laptop Extras driver. |
7 | disk-shock-protection.txt | 5 | disk-shock-protection.txt |
8 | - information on hard disk shock protection. | 6 | - information on hard disk shock protection. |
9 | dslm.c | ||
10 | - Simple Disk Sleep Monitor program | ||
11 | laptop-mode.txt | 7 | laptop-mode.txt |
12 | - how to conserve battery power using laptop-mode. | 8 | - how to conserve battery power using laptop-mode. |
13 | sony-laptop.txt | 9 | sony-laptop.txt |
diff --git a/Documentation/laptops/Makefile b/Documentation/laptops/Makefile deleted file mode 100644 index 0abe44f68965..000000000000 --- a/Documentation/laptops/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # List of programs to build | ||
2 | hostprogs-y := dslm | ||
3 | |||
4 | # Tell kbuild to always build the programs | ||
5 | always := $(hostprogs-y) | ||
diff --git a/Documentation/laptops/laptop-mode.txt b/Documentation/laptops/laptop-mode.txt index 4ebbfc3f1c6e..19276f5d195c 100644 --- a/Documentation/laptops/laptop-mode.txt +++ b/Documentation/laptops/laptop-mode.txt | |||
@@ -779,4 +779,4 @@ Monitoring tool | |||
779 | --------------- | 779 | --------------- |
780 | 780 | ||
781 | Bartek Kania submitted this, it can be used to measure how much time your disk | 781 | Bartek Kania submitted this, it can be used to measure how much time your disk |
782 | spends spun up/down. See Documentation/laptops/dslm.c | 782 | spends spun up/down. See tools/laptop/dslm/dslm.c |
diff --git a/Documentation/laptops/.gitignore b/tools/laptop/dslm/.gitignore index 9fc984e64386..9fc984e64386 100644 --- a/Documentation/laptops/.gitignore +++ b/tools/laptop/dslm/.gitignore | |||
diff --git a/tools/laptop/dslm/Makefile b/tools/laptop/dslm/Makefile new file mode 100644 index 000000000000..ff613b31730b --- /dev/null +++ b/tools/laptop/dslm/Makefile | |||
@@ -0,0 +1,9 @@ | |||
1 | CC := $(CROSS_COMPILE)gcc | ||
2 | CFLAGS := -I../../usr/include | ||
3 | |||
4 | PROGS := dslm | ||
5 | |||
6 | all: $(PROGS) | ||
7 | |||
8 | clean: | ||
9 | rm -fr $(PROGS) | ||
diff --git a/Documentation/laptops/dslm.c b/tools/laptop/dslm/dslm.c index d5dd2d4b04d8..d5dd2d4b04d8 100644 --- a/Documentation/laptops/dslm.c +++ b/tools/laptop/dslm/dslm.c | |||