projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
[cascardo/linux.git]
/
drivers
/
watchdog
/
sa1100_wdt.c
diff --git
a/drivers/watchdog/sa1100_wdt.c
b/drivers/watchdog/sa1100_wdt.c
index
d54e04d
..
54984de
100644
(file)
--- a/
drivers/watchdog/sa1100_wdt.c
+++ b/
drivers/watchdog/sa1100_wdt.c
@@
-28,6
+28,7
@@
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <linux/bitops.h>
#include <linux/uaccess.h>
#include <linux/timex.h>