lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-08-29 11:35:00 -07:00
parent 51cd8e6ff2 3e5531caff
commit a7ccbcf330
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/watchdog/src/watchdog-test.c
View File

@@ -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");

1
drivers/watchdog/da9052_wdt.c
View File

@@ -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>