diff options
| -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 @@ subdir-y := blackfin \ - laptops pcmcia + 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 @@ 00-INDEX - This file -Makefile - - Makefile for building dslm example program. asus-laptop.txt - information on the Asus Laptop Extras driver. disk-shock-protection.txt - information on hard disk shock protection. -dslm.c - - Simple Disk Sleep Monitor program laptop-mode.txt - how to conserve battery power using laptop-mode. 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 @@ -# List of programs to build -hostprogs-y := dslm - -# Tell kbuild to always build the programs -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 --------------- Bartek Kania submitted this, it can be used to measure how much time your disk -spends spun up/down. See Documentation/laptops/dslm.c +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 @@ +CC := $(CROSS_COMPILE)gcc +CFLAGS := -I../../usr/include + +PROGS := dslm + +all: $(PROGS) + +clean: + 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 |