Merge git://www.linux-watchdog.org/linux-watchdog

a7ccbcf3 · Linus Torvalds <[email protected]> · 2012-08-29 11:35:00 -07:00

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a warning for watchdog-test.c and it will remove a
  duplicate include of delay.h"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: da9052: Remove duplicate inclusion of delay.h
  watchdog: fix watchdog-test.c build warning

Commit: a7ccbcf3307022c48810eebd99aa8dba84f13caf
Parents: 51cd8e6f · 3e5531ca

Merge commit. Changes below are compared with the first parent: 51cd8e6f.

Changes

2 files changed · +1 −2

File	Status	Add	Del	Content
Documentation/watchdog/src/watchdog-test.c	modified	+1	−1	View file
drivers/watchdog/da9052_wdt.c	modified	+0	−1	View file

Documentation/watchdog/src/watchdog-test.c

View file

diff --git a/Documentation/watchdog/src/watchdog-test.c b/Documentation/watchdog/src/watchdog-test.c
index 73ff5cc..3da8229 100644
--- a/Documentation/watchdog/src/watchdog-test.c
+++ b/Documentation/watchdog/src/watchdog-test.c
@@ -31,7 +31,7 @@ static void keep_alive(void)
  * or "-e" to enable the card.
  */
 
-void term(int sig)
+static void term(int sig)
 {
     close(fd);
     fprintf(stderr, "Stopping watchdog ticks...\n");

drivers/watchdog/da9052_wdt.c

View file

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index 3f75129..f7abbae 100644
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -21,7 +21,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
-#include <linux/delay.h>
 
 #include <linux/mfd/da9052/reg.h>
 #include <linux/mfd/da9052/da9052.h>