History

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

Linus Torvalds committed 14 years ago

Commit a7ccbcf2 parents 51cd8e6 3e5531c2 files · +1 −2Browse files

Unified · Split

2 files
  1. Documentation/watchdog/src/watchdog-test.c +1 −1
  2. drivers/watchdog/da9052_wdt.c +0 −1
Documentation/watchdog/src/watchdog-test.c+1−1
@@ -31,7 +31,7 @@ static void keep_alive(void) · 30 unmodified lines
31 * or "-e" to enable the card.31 * or "-e" to enable the card.
32 */32 */
33 33
34void term(int sig)34static void term(int sig)
35{35{
36 close(fd);36 close(fd);
37 fprintf(stderr, "Stopping watchdog ticks...\n");37 fprintf(stderr, "Stopping watchdog ticks...\n");
drivers/watchdog/da9052_wdt.c+0−1
@@ -21,7 +21,6 @@ · 20 unmodified lines
21#include <linux/types.h>21#include <linux/types.h>
22#include <linux/kernel.h>22#include <linux/kernel.h>
23#include <linux/jiffies.h>23#include <linux/jiffies.h>
24#include <linux/delay.h>
25 24
26#include <linux/mfd/da9052/reg.h>25#include <linux/mfd/da9052/reg.h>
27#include <linux/mfd/da9052/da9052.h>26#include <linux/mfd/da9052/da9052.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t