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 /drivers | |
| parent | mm, slab: lock the correct nodelist after reenabling irqs (diff) | |
| parent | watchdog: da9052: Remove duplicate inclusion of delay.h (diff) | |
| download | linux-dev-a7ccbcf3307022c48810eebd99aa8dba84f13caf.tar.xz linux-dev-a7ccbcf3307022c48810eebd99aa8dba84f13caf.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/da9052_wdt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index 3f75129eb0a9..f7abbaeebcaf 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> |