Commit a7ccbcf3 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 51cd8e6f 3e5531ca
...@@ -31,7 +31,7 @@ static void keep_alive(void) ...@@ -31,7 +31,7 @@ static void keep_alive(void)
* or "-e" to enable the card. * or "-e" to enable the card.
*/ */
void term(int sig) static void term(int sig)
{ {
close(fd); close(fd);
fprintf(stderr, "Stopping watchdog ticks...\n"); fprintf(stderr, "Stopping watchdog ticks...\n");
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/mfd/da9052/reg.h> #include <linux/mfd/da9052/reg.h>
#include <linux/mfd/da9052/da9052.h> #include <linux/mfd/da9052/da9052.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment