diff options
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/watchdog/Makefile | 1 | ||||
| -rw-r--r-- | Documentation/watchdog/src/Makefile | 5 | ||||
| -rw-r--r-- | Documentation/watchdog/watchdog-api.txt | 2 | ||||
| -rw-r--r-- | Documentation/watchdog/wdt.txt | 2 | ||||
| -rw-r--r-- | samples/watchdog/.gitignore (renamed from Documentation/watchdog/src/.gitignore) | 0 | ||||
| -rw-r--r-- | samples/watchdog/Makefile | 8 | ||||
| -rw-r--r-- | samples/watchdog/watchdog-simple.c (renamed from Documentation/watchdog/src/watchdog-simple.c) | 0 |
8 files changed, 11 insertions, 9 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index fc386b7a01b2..b2210b7af2e5 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,2 +1,2 @@ subdir-y := accounting auxdisplay blackfin \ - laptops pcmcia watchdog + laptops pcmcia diff --git a/Documentation/watchdog/Makefile b/Documentation/watchdog/Makefile deleted file mode 100644 index 6018f45f2471..000000000000 --- a/Documentation/watchdog/Makefile +++ /dev/null @@ -1 +0,0 @@ -subdir-y := src diff --git a/Documentation/watchdog/src/Makefile b/Documentation/watchdog/src/Makefile deleted file mode 100644 index 47be791827d4..000000000000 --- a/Documentation/watchdog/src/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# List of programs to build -hostprogs-y := watchdog-simple - -# Tell kbuild to always build the programs -always := $(hostprogs-y) diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt index b3a701f48118..0e62ba33b7fb 100644 --- a/Documentation/watchdog/watchdog-api.txt +++ b/Documentation/watchdog/watchdog-api.txt @@ -37,7 +37,7 @@ activates as soon as /dev/watchdog is opened and will reboot unless the watchdog is pinged within a certain time, this time is called the timeout or margin. The simplest way to ping the watchdog is to write some data to the device. So a very simple watchdog daemon would look -like this source file: see Documentation/watchdog/src/watchdog-simple.c +like this source file: see samples/watchdog/watchdog-simple.c A more advanced driver could for example check that a HTTP server is still responding before doing the write call to ping the watchdog. diff --git a/Documentation/watchdog/wdt.txt b/Documentation/watchdog/wdt.txt index 061c2e35384f..ed2f0b860869 100644 --- a/Documentation/watchdog/wdt.txt +++ b/Documentation/watchdog/wdt.txt @@ -47,4 +47,4 @@ The external event interfaces on the WDT boards are not currently supported. Minor numbers are however allocated for it. -Example Watchdog Driver: see Documentation/watchdog/src/watchdog-simple.c +Example Watchdog Driver: see samples/watchdog/watchdog-simple.c diff --git a/Documentation/watchdog/src/.gitignore b/samples/watchdog/.gitignore index ff0ebb540333..ff0ebb540333 100644 --- a/Documentation/watchdog/src/.gitignore +++ b/samples/watchdog/.gitignore diff --git a/samples/watchdog/Makefile b/samples/watchdog/Makefile new file mode 100644 index 000000000000..9b53d89b1ccf --- /dev/null +++ b/samples/watchdog/Makefile @@ -0,0 +1,8 @@ +CC := $(CROSS_COMPILE)gcc +PROGS := watchdog-simple + +all: $(PROGS) + +clean: + rm -fr $(PROGS) + diff --git a/Documentation/watchdog/src/watchdog-simple.c b/samples/watchdog/watchdog-simple.c index ba45803a2216..ba45803a2216 100644 --- a/Documentation/watchdog/src/watchdog-simple.c +++ b/samples/watchdog/watchdog-simple.c |