diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-29 11:35:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-29 11:35:00 -0700 |
| commit | a7ccbcf3307022c48810eebd99aa8dba84f13caf (patch) | |
| tree | a078d06b9d9ceb45b4b26d1b69d47e1fa465a38e | |
| parent | 51cd8e6ff265650e35e46b5bcbe2ee381a7a2877 (diff) | |
| parent | 3e5531caffcc07b67452c4a8170ffb4c2bd1c9b7 (diff) | |
| download | memcg-a7ccbcf3307022c48810eebd99aa8dba84f13caf.tar.gz | |
Merge git://www.linux-watchdog.org/linux-watchdog
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
| -rw-r--r-- | Documentation/watchdog/src/watchdog-test.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/da9052_wdt.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/watchdog/src/watchdog-test.c b/Documentation/watchdog/src/watchdog-test.c index 73ff5cc93e05db..3da822967ee0e1 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"); diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index 3f75129eb0a9f0..f7abbaeebcaf51 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> |